mirror of
https://github.com/openai/codex.git
synced 2026-04-24 22:54:54 +00:00
chore: fix the build breakage that came from a merge race (#10239)
I think I needed to rebase on top of https://github.com/openai/codex/pull/10167 before merging https://github.com/openai/codex/pull/10208.
This commit is contained in:
1
codex-rs/Cargo.lock
generated
1
codex-rs/Cargo.lock
generated
@@ -1298,7 +1298,6 @@ version = "0.0.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64",
|
"base64",
|
||||||
"codex-app-server-protocol",
|
|
||||||
"codex-backend-client",
|
"codex-backend-client",
|
||||||
"codex-core",
|
"codex-core",
|
||||||
"codex-otel",
|
"codex-otel",
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ workspace = true
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
async-trait = { workspace = true }
|
async-trait = { workspace = true }
|
||||||
codex-app-server-protocol = { workspace = true }
|
|
||||||
codex-backend-client = { workspace = true }
|
codex-backend-client = { workspace = true }
|
||||||
codex-core = { workspace = true }
|
codex-core = { workspace = true }
|
||||||
codex-otel = { workspace = true }
|
codex-otel = { workspace = true }
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
//! requirements before Codex will run.
|
//! requirements before Codex will run.
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use codex_app_server_protocol::AuthMode;
|
|
||||||
use codex_backend_client::Client as BackendClient;
|
use codex_backend_client::Client as BackendClient;
|
||||||
use codex_core::AuthManager;
|
use codex_core::AuthManager;
|
||||||
use codex_core::auth::CodexAuth;
|
use codex_core::auth::CodexAuth;
|
||||||
@@ -120,9 +119,7 @@ impl CloudRequirementsService {
|
|||||||
|
|
||||||
async fn fetch(&self) -> Option<ConfigRequirementsToml> {
|
async fn fetch(&self) -> Option<ConfigRequirementsToml> {
|
||||||
let auth = self.auth_manager.auth().await?;
|
let auth = self.auth_manager.auth().await?;
|
||||||
if !(auth.mode == AuthMode::ChatGPT
|
if !(auth.is_chatgpt_auth() && auth.account_plan_type() == Some(PlanType::Enterprise)) {
|
||||||
&& auth.account_plan_type() == Some(PlanType::Enterprise))
|
|
||||||
{
|
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user