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>
This commit is contained in:
Martin Vogel committed 2026-08-06 02:54:23 +02:00
1 parent 3e06362160
commit ba5724319c
2 files changed
+9 -3

No files matched your search

+3 -1
View File
@@ -269,7 +269,9 @@ case "${1:-full}" in
echo "=== Windows: binary version check (cross-compile + Wine) ==="
$COMPOSE run --rm smoke-windows
;;
amd64)
amd64 | test-amd64)
# `--help` advertises `amd64|test-amd64`, but only `amd64` dispatched:
# the documented spelling died with "unknown leg 'test-amd64'".
echo "=== Linux amd64: test + build ==="
$COMPOSE run --rm -e CBM_SKIP_PERF=1 test-amd64
$COMPOSE run --rm build-amd64
+6 -2
View File
@@ -145,8 +145,12 @@ vm_ensure_run_checkout() {
# `fetch origin <branch>` would resolve against whatever the base happens
# to hold (i.e. another session's state) instead of GitHub. Inherit the
# base's real origin URL so the isolated tree fetches independently.
vm clangarm64 "[ -d '$VM_REPO/.git' ] || { git clone --local '$VM_BASE_REPO' '$VM_REPO' && \
git -C '$VM_REPO' remote set-url origin \"\$(git -C '$VM_BASE_REPO' remote get-url origin)\"; }"
# The substitution is single-quoted here so it expands in the REMOTE shell
# (same pattern as JOBS above); nested double quotes do not survive the
# cmd.exe -> msys2_shell wrapper.
local base_url_expr='$(git -C '"$VM_BASE_REPO"' remote get-url origin)'
vm clangarm64 "[ -d '$VM_REPO/.git' ] || git clone --local '$VM_BASE_REPO' '$VM_REPO'"
vm clangarm64 "git -C '$VM_REPO' remote set-url origin $base_url_expr"
}
# The VM tree must be the one the caller means. A concurrent session running