mirror of
https://github.com/openai/codex.git
synced 2026-10-29 19:08:43 +00:00
Fix argument comment lint tests after rust-clippy branch rename (#58013)
## Why Dylint 6.1.0 still checks out rust-clippy's removed `master` branch. ## What changed Run the argument comment lint package tests through a compatibility wrapper in both Rust CI workflows. The wrapper temporarily aliases rust-clippy's `main` branch to `master` using Git configuration scoped to that repository, preserves existing Git configuration entries, and forwards arguments to `cargo test`. GitOrigin-RevId: 016d09c4ef71259f7d4eca4409f753bf66ae9e18
This commit is contained in:
@@ -85,7 +85,7 @@ jobs:
|
||||
run: python3 -m unittest discover -s tools/argument-comment-lint -p 'test_*.py'
|
||||
- name: Test argument comment lint package
|
||||
working-directory: tools/argument-comment-lint
|
||||
run: cargo test
|
||||
run: bash ./test-with-clippy-compat.sh
|
||||
env:
|
||||
RUST_MIN_STACK: "8388608" # 8 MiB
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ jobs:
|
||||
run: python3 -m unittest discover -s tools/argument-comment-lint -p 'test_*.py'
|
||||
- name: Test argument comment lint package
|
||||
working-directory: tools/argument-comment-lint
|
||||
run: cargo test
|
||||
run: bash ./test-with-clippy-compat.sh
|
||||
env:
|
||||
RUST_MIN_STACK: "8388608" # 8 MiB
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Dylint 6.1.0 still checks out rust-clippy's removed master branch. Add an
|
||||
# alias only to that clone until we upgrade to a Dylint version that uses main.
|
||||
clippy_config="$(mktemp)"
|
||||
trap 'rm -f -- "$clippy_config"' EXIT
|
||||
git config --file "$clippy_config" remote.origin.fetch '+refs/heads/main:refs/heads/master'
|
||||
|
||||
config_index="${GIT_CONFIG_COUNT:-0}"
|
||||
export "GIT_CONFIG_KEY_${config_index}=includeIf.hasconfig:remote.*.url:https://github.com/rust-lang/rust-clippy.path"
|
||||
export "GIT_CONFIG_VALUE_${config_index}=$clippy_config"
|
||||
GIT_CONFIG_COUNT="$((config_index + 1))" cargo test "$@"
|
||||
Reference in New Issue
Block a user