more 6.0 nightly to 6.1 nightly CI changes (#3078)

### Motivation: Some changes were missed in #3076, passing through parameters for the new 6.1 version. ### Modifications: Pass through more parameters, clean up misleading comments. ### Result: 6.1 nightly runs will be more like 6.0 nightly runs were
apple · Jan 22, 2025 · 9336e1f · 9336e1f
1 parent 5595698
commit 9336e1f
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -24,7 +24,11 @@ on:
         default: true
       linux_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: false
+      linux_nightly_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
         default: true
       linux_nightly_main_enabled:
         type: boolean
@@ -33,15 +37,15 @@ on:
 
       windows_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Currently has no effect!"  # TODO: implement Windows benchmarking
         default: false
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."  # TODO: implement Windows benchmarking
         default: false
       windows_nightly_main_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows nightly main Swift version matrix job. Currently has no effect!"  # TODO: implement Windows benchmarking
         default: false
 
 jobs:
@@ -63,7 +67,7 @@ jobs:
           MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
           MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
 
   benchmarks:

diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml
@@ -16,6 +16,10 @@ on:
         description: "Boolean to enable the Linux 6.0 Swift version matrix job. Defaults to true."
         default: true
       linux_nightly_6_0_enabled:
+        type: boolean
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."
+        default: false
+      linux_nightly_6_1_enabled:
         type: boolean
         description: "Boolean to enable the Linux nightly 6.0 Swift version matrix job. Defaults to true."
         default: true
@@ -30,7 +34,7 @@ on:
         default: false
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to false. Currently has no effect!"  # TODO: implement Windows Cxx compat checking
+        description: "⚠️  Deprecated, we no longer run against 6.0 nightly."  # TODO: implement Windows Cxx compat checking
         default: false
       windows_nightly_main_enabled:
         type: boolean
@@ -56,7 +60,7 @@ jobs:
           MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
           MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
           MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
-          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_1_ENABLED: ${{ inputs.linux_nightly_6_1_enabled }}
           MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
 
   cxx-interop:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
       linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
-      linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+      linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   cxx-interop:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
       linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
-      linux_nightly_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
+      linux_nightly_6_1_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 
   benchmarks:

diff --git a/...eBenchmarks.NIOAsyncChannel.init.p90.json → ...eBenchmarks.NIOAsyncChannel.init.p90.json b/...eBenchmarks.NIOAsyncChannel.init.p90.json → ...eBenchmarks.NIOAsyncChannel.init.p90.json
diff --git a/...y-6.0/NIOPosixBenchmarks.TCPEcho.p90.json → ...y-6.1/NIOPosixBenchmarks.TCPEcho.p90.json b/...y-6.0/NIOPosixBenchmarks.TCPEcho.p90.json → ...y-6.1/NIOPosixBenchmarks.TCPEcho.p90.json
diff --git a/...ixBenchmarks.TCPEchoAsyncChannel.p90.json → ...ixBenchmarks.TCPEchoAsyncChannel.p90.json b/...ixBenchmarks.TCPEchoAsyncChannel.p90.json → ...ixBenchmarks.TCPEchoAsyncChannel.p90.json
diff --git a/...4_performance/Thresholds/nightly-6.0.json → ...4_performance/Thresholds/nightly-6.1.json b/...4_performance/Thresholds/nightly-6.0.json → ...4_performance/Thresholds/nightly-6.1.json
diff --git a/scripts/check-matrix-job.ps1 b/scripts/check-matrix-job.ps1
@@ -52,7 +52,7 @@ $command = $env:COMMAND
 $command_5_9 = $env:COMMAND_OVERRIDE_5_9
 $command_5_10 = $env:COMMAND_OVERRIDE_5_10
 $command_6_0 = $env:COMMAND_OVERRIDE_6_0
-$command_nightly_6_0 = $env:COMMAND_OVERRIDE_NIGHTLY_6_0
+$command_nightly_6_1 = $env:COMMAND_OVERRIDE_NIGHTLY_6_1
 $command_nightly_main = $env:COMMAND_OVERRIDE_NIGHTLY_MAIN
 
 if ($swift_version -eq "5.9" -and $command_5_9) {
@@ -64,9 +64,9 @@ if ($swift_version -eq "5.9" -and $command_5_9) {
 } elseif ($swift_version -eq "6.0" -and $command_6_0) {
     Log "Running 6.0 command override"
     Invoke-Expression $command_6_0
-} elseif ($swift_version -eq "nightly-6.0" -and $command_nightly_6_0) {
+} elseif ($swift_version -eq "nightly-6.0" -and $command_nightly_6_1) {
     Log "Running nightly 6.0 command override"
-    Invoke-Expression $command_nightly_6_0
+    Invoke-Expression $command_nightly_6_1
 } elseif ($swift_version -eq "nightly-main" -and $command_nightly_main) {
     Log "Running nightly main command override"
     Invoke-Expression $command_nightly_main

diff --git a/scripts/check-matrix-job.sh b/scripts/check-matrix-job.sh
@@ -25,7 +25,7 @@ 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_0="$COMMAND_OVERRIDE_NIGHTLY_6_0"
+command_nightly_6_1="$COMMAND_OVERRIDE_NIGHTLY_6_1"
 command_nightly_main="$COMMAND_OVERRIDE_NIGHTLY_MAIN"
 
 if [[ "$swift_version" == "5.9" ]] && [[ -n "$command_5_9" ]]; then
@@ -37,9 +37,9 @@ 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.0" ]] && [[ -n "$command_nightly_6_0" ]]; then
+elif [[ "$swift_version" == "nightly-6.0" ]] && [[ -n "$command_nightly_6_1" ]]; then
   log "Running nightly 6.0 command override"
-  eval "$command_nightly_6_0"
+  eval "$command_nightly_6_1"
 elif [[ "$swift_version" == "nightly-main" ]] && [[ -n "$command_nightly_main" ]]; then
   log "Running nightly main command override"
   eval "$command_nightly_main"