Skip to content

Commit ba57243

Browse files
committed
fix(ci): accept the documented test-amd64 leg spelling
run.sh --help advertises 'amd64|test-amd64|tsan-amd64', but only 'amd64' was dispatched, so the documented spelling failed with "unknown leg 'test-amd64'". Accept both. Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent 3e06362 commit ba57243

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

‎test-infrastructure/run.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ case "${1:-full}" in
269269
echo "=== Windows: binary version check (cross-compile + Wine) ==="
270270
$COMPOSE run --rm smoke-windows
271271
;;
272-
amd64)
272+
amd64 | test-amd64)
273+
# `--help` advertises `amd64|test-amd64`, but only `amd64` dispatched:
274+
# the documented spelling died with "unknown leg 'test-amd64'".
273275
echo "=== Linux amd64: test + build ==="
274276
$COMPOSE run --rm -e CBM_SKIP_PERF=1 test-amd64
275277
$COMPOSE run --rm build-amd64

‎test-infrastructure/vm/win.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,12 @@ vm_ensure_run_checkout() {
145145
# `fetch origin <branch>` would resolve against whatever the base happens
146146
# to hold (i.e. another session's state) instead of GitHub. Inherit the
147147
# base's real origin URL so the isolated tree fetches independently.
148-
vm clangarm64 "[ -d '$VM_REPO/.git' ] || { git clone --local '$VM_BASE_REPO' '$VM_REPO' && \
149-
git -C '$VM_REPO' remote set-url origin \"\$(git -C '$VM_BASE_REPO' remote get-url origin)\"; }"
148+
# The substitution is single-quoted here so it expands in the REMOTE shell
149+
# (same pattern as JOBS above); nested double quotes do not survive the
150+
# cmd.exe -> msys2_shell wrapper.
151+
local base_url_expr='$(git -C '"$VM_BASE_REPO"' remote get-url origin)'
152+
vm clangarm64 "[ -d '$VM_REPO/.git' ] || git clone --local '$VM_BASE_REPO' '$VM_REPO'"
153+
vm clangarm64 "git -C '$VM_REPO' remote set-url origin $base_url_expr"
150154
}
151155

152156
# The VM tree must be the one the caller means. A concurrent session running

0 commit comments

Comments
 (0)