From c48f99e7038e4a696c76f4375ab726354bdf1e18 Mon Sep 17 00:00:00 2001
From: Rick Newton-Rogers <rnro@apple.com>
Date: Mon, 14 Apr 2025 10:52:35 +0100
Subject: [PATCH] Update matrix job script for 6.1

Motivation:

The matrix job script used by the legacy Swift matrix workflow is still
used directly in some places where they need to run sidecar services, it
hasn't been updated for Swift 6.1

Modifications:

Add cases for Swift 6.1 and clean up some missed changes for the
nightly-6.1 -> nightly-next naming change.

Result:

Downstream services should be able to run matrix workflows with Swift
6.1.
---
 scripts/check-matrix-job.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/check-matrix-job.sh b/scripts/check-matrix-job.sh
index a6723b9290b..8149bdc48ae 100755
--- a/scripts/check-matrix-job.sh
+++ b/scripts/check-matrix-job.sh
@@ -25,7 +25,8 @@ command="$COMMAND"
 command_5_9="$COMMAND_OVERRIDE_5_9"
 command_5_10="$COMMAND_OVERRIDE_5_10"
 command_6_0="$COMMAND_OVERRIDE_6_0"
-command_nightly_6_1="${COMMAND_OVERRIDE_NIGHTLY_6_1:=""}"
+command_6_1="$COMMAND_OVERRIDE_6_1"
+command_nightly_next="${COMMAND_OVERRIDE_NIGHTLY_NEXT:=""}"
 command_nightly_main="$COMMAND_OVERRIDE_NIGHTLY_MAIN"
 
 if [[ "$swift_version" == "5.9" ]] && [[ -n "$command_5_9" ]]; then
@@ -37,9 +38,12 @@ elif [[ "$swift_version" == "5.10" ]] && [[ -n "$command_5_10" ]]; then
 elif [[ "$swift_version" == "6.0" ]] && [[ -n "$command_6_0" ]]; then
   log "Running 6.0 command override"
   eval "$command_6_0"
-elif [[ "$swift_version" == "nightly-6.1" ]] && [[ -n "$command_nightly_6_1" ]]; then
+elif [[ "$swift_version" == "6.1" ]] && [[ -n "$command_6_1" ]]; then
+  log "Running 6.1 command override"
+  eval "$command_6_1"
+elif [[ "$swift_version" == "nightly-next" ]] && [[ -n "$command_nightly_next" ]]; then
   log "Running nightly 6.1 command override"
-  eval "$command_nightly_6_1"
+  eval "$command_nightly_next"
 elif [[ "$swift_version" == "nightly-main" ]] && [[ -n "$command_nightly_main" ]]; then
   log "Running nightly main command override"
   eval "$command_nightly_main"