openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-08 20:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: preserve generic Windows hybrid execution

Browse Source
This commit is contained in:
Adam Perry
2026-06-22 19:39:33 +00:00
parent 23d3e288ea
commit 7298ce8576
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/scripts/run-bazel-ci.sh
+1 -1
View File
@@ -286,7 +286,7 @@ if [[ "${RUNNER_OS:-}" == "Windows" && -n "${BUILDBUDDY_API_KEY:-}" && ( $window
fi
fi
if [[ "${RUNNER_OS:-}" == "Windows" && ! ( -n "${BUILDBUDDY_API_KEY:-}" && ( $windows_cross_compile -eq 1 || "$ci_config" == "ci-windows-argument-lint" ) ) ]]; then
if [[ "${RUNNER_OS:-}" == "Windows" && ! ( -n "${BUILDBUDDY_API_KEY:-}" && ( $windows_cross_compile -eq 1 || $windows_hybrid_execution -eq 1 ) ) ]]; then
post_config_bazel_args+=("--shell_executable=${BAZEL_SH}")
fi
.github/scripts/test_run_bazel_with_buildbuddy.py
+4 -1
View File
@@ -239,7 +239,10 @@ class RunBazelWithBuildBuddyTest(unittest.TestCase):
"//codex-rs/arg0:arg0",
)
self.assertIn("--config=ci-windows-hybrid", command)
self.assertIn("--shell_executable=/bin/bash", command)
self.assertEqual(
[arg for arg in command if arg.startswith("--shell_executable=")],
["--shell_executable=/bin/bash"],
)
self.assertIn("--action_env=PATH=/usr/bin:/bin", command)
self.assertIn("--host_action_env=PATH=/usr/bin:/bin", command)
self.assertIn(r"--test_env=PATH=C:\runtime\bin", command)