Skip to content

Commit 187bfa8

Browse files
authored
check-matrix-job.sh should tolerate unset 6.1 vars (apple#3080)
### Motivation: We recently added support for nightly 6.1 Swift and old scripts making use of `check-matrix-job.sh` do not set `COMMAND_OVERRIDE_NIGHTLY_6_1` which causes the script to fail. We should tolerate this. ### Modifications: Add a default case for `COMMAND_OVERRIDE_NIGHTLY_6_1`. ### Result: No failures if a caller doesn't specify `COMMAND_OVERRIDE_NIGHTLY_6_1`. ``` ❯ SWIFT_VERSION=nightly-6.1 COMMAND="echo foo" COMMAND_OVERRIDE_5_9="" COMMAND_OVERRIDE_5_10="" COMMAND_OVERRIDE_6_0="" COMMAND_OVERRIDE_NIGHTLY_MAIN="" ./scripts/check-matrix-job.sh ** Running default command foo ❯ SWIFT_VERSION=nightly-6.1 COMMAND="echo foo" COMMAND_OVERRIDE_5_9="" COMMAND_OVERRIDE_5_10="" COMMAND_OVERRIDE_6_0="" COMMAND_OVERRIDE_NIGHTLY_MAIN="" COMMAND_OVERRIDE_NIGHTLY_6_1="echo bar" ./scripts/check-matrix-job.sh ** Running nightly 6.1 command override bar ```
1 parent 9336e1f commit 187bfa8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

scripts/check-matrix-job.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ if ($swift_version -eq "5.9" -and $command_5_9) {
6464
} elseif ($swift_version -eq "6.0" -and $command_6_0) {
6565
Log "Running 6.0 command override"
6666
Invoke-Expression $command_6_0
67-
} elseif ($swift_version -eq "nightly-6.0" -and $command_nightly_6_1) {
68-
Log "Running nightly 6.0 command override"
67+
} elseif ($swift_version -eq "nightly-6.1" -and $command_nightly_6_1) {
68+
Log "Running nightly 6.1 command override"
6969
Invoke-Expression $command_nightly_6_1
7070
} elseif ($swift_version -eq "nightly-main" -and $command_nightly_main) {
7171
Log "Running nightly main command override"

scripts/check-matrix-job.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ command="$COMMAND"
2525
command_5_9="$COMMAND_OVERRIDE_5_9"
2626
command_5_10="$COMMAND_OVERRIDE_5_10"
2727
command_6_0="$COMMAND_OVERRIDE_6_0"
28-
command_nightly_6_1="$COMMAND_OVERRIDE_NIGHTLY_6_1"
28+
command_nightly_6_1="${COMMAND_OVERRIDE_NIGHTLY_6_1:=""}"
2929
command_nightly_main="$COMMAND_OVERRIDE_NIGHTLY_MAIN"
3030

3131
if [[ "$swift_version" == "5.9" ]] && [[ -n "$command_5_9" ]]; then
@@ -37,8 +37,8 @@ elif [[ "$swift_version" == "5.10" ]] && [[ -n "$command_5_10" ]]; then
3737
elif [[ "$swift_version" == "6.0" ]] && [[ -n "$command_6_0" ]]; then
3838
log "Running 6.0 command override"
3939
eval "$command_6_0"
40-
elif [[ "$swift_version" == "nightly-6.0" ]] && [[ -n "$command_nightly_6_1" ]]; then
41-
log "Running nightly 6.0 command override"
40+
elif [[ "$swift_version" == "nightly-6.1" ]] && [[ -n "$command_nightly_6_1" ]]; then
41+
log "Running nightly 6.1 command override"
4242
eval "$command_nightly_6_1"
4343
elif [[ "$swift_version" == "nightly-main" ]] && [[ -n "$command_nightly_main" ]]; then
4444
log "Running nightly main command override"

0 commit comments

Comments
 (0)