openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-13 11:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: run Windows argument-comment-lint via native Bazel

Browse Source
This commit is contained in:
Michael Bolin
2026-03-28 15:53:45 -07:00
parent a16a9109d7
commit 3997146eaa
14 changed files with 440 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
.github/scripts/run-argument-comment-lint-bazel.sh vendored Executable file
View File

@@ -0,0 +1,192 @@
#!/usr/bin/env bash
set -euo pipefail
all_manual_rust_test_targets=()
compatible_manual_rust_test_targets=()
incompatible_manual_rust_test_targets=()
cquery_stdout="$(mktemp)"
cquery_stderr="$(mktemp)"
trap 'rm -f "$cquery_stdout" "$cquery_stderr"' EXIT
ci_config=ci-linux
case "${RUNNER_OS:-}" in
macOS)
ci_config=ci-macos
;;
Windows)
ci_config=ci-windows
;;
esac
bazel_startup_args=()
if [[ -n "${BAZEL_OUTPUT_USER_ROOT:-}" ]]; then
bazel_startup_args+=("--output_user_root=${BAZEL_OUTPUT_USER_ROOT}")
fi
run_bazel() {
if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
MSYS2_ARG_CONV_EXCL='*' bazel "$@"
return
fi
bazel "$@"
}
cquery_args=("$@" "--config=${ci_config}" "--keep_going")
compatibility_cquery_args=("$@" "--config=${ci_config}")
query_args=()
if [[ -n "${BAZEL_REPO_CONTENTS_CACHE:-}" ]]; then
cquery_args+=("--repo_contents_cache=${BAZEL_REPO_CONTENTS_CACHE}")
compatibility_cquery_args+=("--repo_contents_cache=${BAZEL_REPO_CONTENTS_CACHE}")
query_args+=("--repo_contents_cache=${BAZEL_REPO_CONTENTS_CACHE}")
fi
if [[ -n "${BAZEL_REPOSITORY_CACHE:-}" ]]; then
cquery_args+=("--repository_cache=${BAZEL_REPOSITORY_CACHE}")
compatibility_cquery_args+=("--repository_cache=${BAZEL_REPOSITORY_CACHE}")
query_args+=("--repository_cache=${BAZEL_REPOSITORY_CACHE}")
fi
if [[ -n "${BUILDBUDDY_API_KEY:-}" ]]; then
cquery_args+=("--remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}")
compatibility_cquery_args+=("--remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}")
query_args+=("--remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY}")
fi
# The generated unit-test binaries all end in `-unit-tests-bin`. Enumerate
# those labels explicitly so the final Bazel build can subtract them from the
# wildcard target set and then add back only the compatible subset on Windows.
manual_rust_test_query='kind("rust_test rule", filter("-unit-tests-bin$", //codex-rs/...))'
if ! run_bazel "${bazel_startup_args[@]}" \
--noexperimental_remote_repo_contents_cache \
cquery \
"${cquery_args[@]}" \
--output=label \
"$manual_rust_test_query" >"$cquery_stdout" 2>"$cquery_stderr"; then
if [[ ! -s "$cquery_stdout" ]]; then
cat "$cquery_stderr" >&2
exit 1
fi
fi
while IFS= read -r label; do
[[ -n "$label" ]] || continue
incompatible_manual_rust_test_targets+=("$label")
done < <(
sed -n 's/^Target \(\/\/[^ ]*\) is incompatible and cannot be built, but was explicitly requested\.$/\1/p' "$cquery_stderr"
)
is_incompatible_manual_rust_test_target() {
local candidate="$1"
local incompatible_label
for incompatible_label in "${incompatible_manual_rust_test_targets[@]}"; do
if [[ "$candidate" == "$incompatible_label" ]]; then
return 0
fi
done
return 1
}
normalize_bazel_label() {
local label="$1"
if [[ "$label" == /* && "$label" != //* ]]; then
printf '/%s\n' "$label"
return
fi
printf '%s\n' "$label"
}
manual_rust_test_target_is_compatible() {
local candidate="$1"
local compatibility_stdout
local compatibility_stderr
compatibility_stdout="$(mktemp)"
compatibility_stderr="$(mktemp)"
if run_bazel "${bazel_startup_args[@]}" \
--noexperimental_remote_repo_contents_cache \
cquery \
"${compatibility_cquery_args[@]}" \
--output=label \
"$candidate" >"$compatibility_stdout" 2>"$compatibility_stderr"; then
if grep -Fq "Target ${candidate} is incompatible and cannot be built, but was explicitly requested." "$compatibility_stderr"; then
rm -f "$compatibility_stdout" "$compatibility_stderr"
return 1
fi
if [[ ! -s "$compatibility_stdout" ]]; then
cat "$compatibility_stderr" >&2
rm -f "$compatibility_stdout" "$compatibility_stderr"
exit 1
fi
rm -f "$compatibility_stdout" "$compatibility_stderr"
return 0
fi
if grep -Fq "Target ${candidate} is incompatible and cannot be built, but was explicitly requested." "$compatibility_stderr"; then
rm -f "$compatibility_stdout" "$compatibility_stderr"
return 1
fi
cat "$compatibility_stderr" >&2
rm -f "$compatibility_stdout" "$compatibility_stderr"
exit 1
}
while IFS= read -r label; do
[[ -n "$label" ]] || continue
# cquery emits configured target labels as `//pkg:target (abcdef0)`. Strip
# the configuration hash before passing the label back to `bazel build`.
label="${label%% (*}"
label="$(normalize_bazel_label "$label")"
all_manual_rust_test_targets+=("$label")
if is_incompatible_manual_rust_test_target "$label"; then
continue
fi
if [[ "${RUNNER_OS:-}" == "Windows" ]] && ! manual_rust_test_target_is_compatible "$label"; then
continue
fi
compatible_manual_rust_test_targets+=("$label")
done <"$cquery_stdout"
for label in "${incompatible_manual_rust_test_targets[@]}"; do
all_manual_rust_test_targets+=("$label")
done
excluded_manual_rust_test_targets=()
for label in "${all_manual_rust_test_targets[@]}"; do
excluded_manual_rust_test_targets+=("-${label}")
done
final_build_targets=(//codex-rs/... "${excluded_manual_rust_test_targets[@]}" "${compatible_manual_rust_test_targets[@]}")
if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
base_rule_targets_stdout="$(mktemp)"
base_rule_targets_stderr="$(mktemp)"
base_rule_targets_query='kind(".* rule", //codex-rs/...) except filter("-unit-tests-bin$", //codex-rs/...)'
if ! run_bazel "${bazel_startup_args[@]}" \
--noexperimental_remote_repo_contents_cache \
query \
"${query_args[@]}" \
"$base_rule_targets_query" >"$base_rule_targets_stdout" 2>"$base_rule_targets_stderr"; then
cat "$base_rule_targets_stderr" >&2
rm -f "$base_rule_targets_stdout" "$base_rule_targets_stderr"
exit 1
fi
final_build_targets=()
while IFS= read -r label; do
[[ -n "$label" ]] || continue
label="$(normalize_bazel_label "$label")"
final_build_targets+=("$label")
done <"$base_rule_targets_stdout"
rm -f "$base_rule_targets_stdout" "$base_rule_targets_stderr"
final_build_targets+=("${compatible_manual_rust_test_targets[@]}")
fi
./.github/scripts/run-bazel-ci.sh \
-- \
build \
"$@" \
-- \
"${final_build_targets[@]}"

26
.github/scripts/run-bazel-ci.sh vendored
View File

@@ -41,6 +41,15 @@ if [[ -n "${BAZEL_OUTPUT_USER_ROOT:-}" ]]; then
bazel_startup_args+=("--output_user_root=${BAZEL_OUTPUT_USER_ROOT}")
fi
run_bazel() {
if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
MSYS2_ARG_CONV_EXCL='*' bazel "$@"
return
fi
bazel "$@"
}
ci_config=ci-linux
case "${RUNNER_OS:-}" in
macOS)
@@ -60,7 +69,7 @@ print_bazel_test_log_tails() {
bazel_info_cmd+=("${bazel_startup_args[@]}")
fi
testlogs_dir="$("${bazel_info_cmd[@]}" info bazel-testlogs 2>/dev/null || echo bazel-testlogs)"
testlogs_dir="$(run_bazel "${bazel_info_cmd[@]:1}" info bazel-testlogs 2>/dev/null || echo bazel-testlogs)"
local failed_targets=()
while IFS= read -r target; do
@@ -126,6 +135,17 @@ if [[ $remote_download_toplevel -eq 1 ]]; then
post_config_bazel_args+=(--remote_download_toplevel)
fi
if [[ -n "${BAZEL_REPO_CONTENTS_CACHE:-}" ]]; then
# Windows self-hosted runners can run multiple Bazel jobs concurrently. Give
# each job its own repo contents cache so they do not fight over the shared
# path configured in `ci-windows`.
post_config_bazel_args+=("--repo_contents_cache=${BAZEL_REPO_CONTENTS_CACHE}")
fi
if [[ -n "${BAZEL_REPOSITORY_CACHE:-}" ]]; then
post_config_bazel_args+=("--repository_cache=${BAZEL_REPOSITORY_CACHE}")
fi
bazel_console_log="$(mktemp)"
trap 'rm -f "$bazel_console_log"' EXIT
@@ -149,7 +169,7 @@ if [[ -n "${BUILDBUDDY_API_KEY:-}" ]]; then
bazel_run_args+=("${post_config_bazel_args[@]}")
fi
set +e
"${bazel_cmd[@]}" \
run_bazel "${bazel_cmd[@]:1}" \
--noexperimental_remote_repo_contents_cache \
"${bazel_run_args[@]}" \
-- \
@@ -184,7 +204,7 @@ else
bazel_run_args+=("${post_config_bazel_args[@]}")
fi
set +e
"${bazel_cmd[@]}" \
run_bazel "${bazel_cmd[@]:1}" \
--noexperimental_remote_repo_contents_cache \
"${bazel_run_args[@]}" \
-- \