mirror of
https://github.com/openai/codex.git
synced 2026-08-23 13:09:46 +00:00
Fix rg inventory CI checks
This commit is contained in:
2
codex-rs/Cargo.lock
generated
2
codex-rs/Cargo.lock
generated
@@ -3813,7 +3813,7 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "codex-rg"
|
||||
name = "codex-rg-shim"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"notify",
|
||||
|
||||
@@ -223,7 +223,6 @@ codex-prompts = { path = "prompts" }
|
||||
codex-responses-api-proxy = { path = "responses-api-proxy" }
|
||||
codex-response-debug-context = { path = "response-debug-context" }
|
||||
codex-rmcp-client = { path = "rmcp-client" }
|
||||
codex-rg = { path = "rg-shim" }
|
||||
codex-rollout = { path = "rollout" }
|
||||
codex-rollout-trace = { path = "rollout-trace" }
|
||||
codex-sandboxing = { path = "sandboxing" }
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use super::ExecServerRuntimePaths;
|
||||
use super::prepend_package_path;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use pretty_assertions::assert_eq;
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
@@ -20,15 +21,12 @@ fn discovers_package_path_from_codex_executable() {
|
||||
let runtime_paths =
|
||||
ExecServerRuntimePaths::new(codex_exe, /*codex_linux_sandbox_exe*/ None)
|
||||
.expect("runtime paths");
|
||||
let package_path_dir = fs::canonicalize(package_path_dir).expect("canonical package path");
|
||||
let package_path_dir = AbsolutePathBuf::from_absolute_path(
|
||||
fs::canonicalize(package_path_dir).expect("canonical package path"),
|
||||
)
|
||||
.expect("absolute package path");
|
||||
|
||||
assert_eq!(
|
||||
runtime_paths
|
||||
.package_path_dir
|
||||
.as_ref()
|
||||
.map(|path| path.as_path()),
|
||||
Some(package_path_dir.as_path())
|
||||
);
|
||||
assert_eq!(runtime_paths.package_path_dir, Some(package_path_dir));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "codex-rg"
|
||||
name = "codex-rg-shim"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
@@ -13,25 +13,16 @@ name = "codex_rg"
|
||||
path = "src/lib.rs"
|
||||
doctest = false
|
||||
|
||||
[features]
|
||||
manager = [
|
||||
"dep:notify",
|
||||
"dep:tempfile",
|
||||
"dep:tokio",
|
||||
"dep:tracing",
|
||||
"dep:uuid",
|
||||
]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
[dependencies]
|
||||
notify = { workspace = true, optional = true }
|
||||
notify = { workspace = true }
|
||||
sha2 = { workspace = true }
|
||||
tempfile = { workspace = true, optional = true }
|
||||
tokio = { workspace = true, features = ["macros", "rt", "sync"], optional = true }
|
||||
tracing = { workspace = true, optional = true }
|
||||
uuid = { workspace = true, features = ["v4"], optional = true }
|
||||
tempfile = { workspace = true }
|
||||
tokio = { workspace = true, features = ["macros", "rt", "sync"] }
|
||||
tracing = { workspace = true }
|
||||
uuid = { workspace = true, features = ["v4"] }
|
||||
|
||||
[dev-dependencies]
|
||||
pretty_assertions = { workspace = true }
|
||||
|
||||
@@ -64,9 +64,7 @@ pub(crate) fn find_repository_root(cwd: &Path) -> Option<PathBuf> {
|
||||
.map(Path::to_path_buf)
|
||||
}
|
||||
|
||||
#[cfg(feature = "manager")]
|
||||
mod manager;
|
||||
#[cfg(feature = "manager")]
|
||||
pub use manager::RgCacheManager;
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
@@ -88,7 +88,7 @@ impl RgCacheManager {
|
||||
drop(repositories);
|
||||
|
||||
let manager = self.clone();
|
||||
let worker_root = repository_root.clone();
|
||||
let worker_root = repository_root;
|
||||
tokio::spawn(async move {
|
||||
if let Err(error) = manager.run_repository(worker_root.clone()).await {
|
||||
warn!(
|
||||
|
||||
Reference in New Issue
Block a user