check-matrix-job.sh should tolerate unset 6.1 vars #3080
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 ```
rnro
requested review from
FranzBusch and
glbrntt
and removed request for
FranzBusch
glbrntt
approved these changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
We recently added support for nightly 6.1 Swift and old scripts making use of
check-matrix-job.shdo not setCOMMAND_OVERRIDE_NIGHTLY_6_1which 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.