mirror of
https://github.com/openai/codex.git
synced 2026-11-01 19:33:35 +00:00
codex: fix CI failure on PR #16806
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
+5
-1
@@ -418,12 +418,16 @@ bazel_dep(name = "meson", version = "1.5.1.bcr.1")
|
||||
crate.annotation(
|
||||
build_script_tools = [
|
||||
"@meson//:meson",
|
||||
"@llvm-project//clang:libclang_interface_output",
|
||||
"@llvm//:builtin_resource_dir",
|
||||
"@ninja_1.11.0_linux//:ninja_bin",
|
||||
"@ninja_1.12.1_linux_aarch64//:ninja_bin",
|
||||
"@ninja_1.11.0_mac//:ninja_bin",
|
||||
"@ninja_1.11.0_win//:ninja_bin",
|
||||
],
|
||||
build_script_env = {
|
||||
"BINDGEN_EXTRA_CLANG_ARGS": "-Xclang -internal-isystem -Xclang $(location @llvm//:builtin_resource_dir)/include",
|
||||
"LIBCLANG_PATH": "$(location @llvm-project//clang:libclang_interface_output)",
|
||||
"MESON": "$(execpath @meson//:meson)",
|
||||
},
|
||||
build_script_env_select = {
|
||||
@@ -447,7 +451,7 @@ crate.annotation(
|
||||
],
|
||||
)
|
||||
|
||||
inject_repo(crate, "meson", "ninja_1.11.0_linux", "ninja_1.12.1_linux_aarch64", "ninja_1.11.0_mac", "ninja_1.11.0_win")
|
||||
inject_repo(crate, "meson", "ninja_1.11.0_linux", "ninja_1.12.1_linux_aarch64", "ninja_1.11.0_mac", "ninja_1.11.0_win", "llvm", "llvm-project")
|
||||
bazel_dep(name = "v8", version = "14.6.202.9")
|
||||
archive_override(
|
||||
module_name = "v8",
|
||||
|
||||
@@ -32,6 +32,11 @@ index 8578e9220a..bd5c9ba382 100644
|
||||
+ .expect("CARGO_MANIFEST_DIR points inside a Bazel runfiles tree");
|
||||
+ let staged_meson = build_dir.join("meson");
|
||||
+ fs::copy(&meson_launcher, &staged_meson).context("Failed to stage Meson launcher")?;
|
||||
+ let meson_archive = PathBuf::from(&meson_launcher).with_extension("zip");
|
||||
+ if meson_archive.exists() {
|
||||
+ fs::copy(&meson_archive, build_dir.join("meson.zip"))
|
||||
+ .context("Failed to stage Meson support archive")?;
|
||||
+ }
|
||||
+ let mut meson_runfiles = staged_meson.as_os_str().to_owned();
|
||||
+ meson_runfiles.push(".runfiles");
|
||||
+ let _ = fs::remove_file(&meson_runfiles);
|
||||
|
||||
Reference in New Issue
Block a user