Merge branch 'main' into enable_static_sdk_ci

Author: rnro

.github/workflows/main.yml

@@ -11,9 +11,9 @@ jobs:
     name: Unit tests
     uses: ./.github/workflows/unit_tests.yml
     with:
-      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
       linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
       linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 

.github/workflows/pull_request.yml

@@ -15,9 +15,9 @@ jobs:
     name: Unit tests
     uses: ./.github/workflows/unit_tests.yml
     with:
-      linux_5_9_arguments_override: "--explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "--explicit-target-dependency-import-check error"
       linux_6_0_arguments_override: "--explicit-target-dependency-import-check error"
+      linux_6_1_arguments_override: "--explicit-target-dependency-import-check error"
       linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
       linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
 

.github/workflows/unit_tests.yml

@@ -3,14 +3,6 @@ name: Unit tests
 on:
   workflow_call:
     inputs:
-      linux_5_9_enabled:
-        type: boolean
-        description: "Boolean to enable the Linux 5.9 Swift version matrix job. Defaults to true."
-        default: true
-      linux_5_9_arguments_override:
-        type: string
-        description: "The arguments passed to swift test in the Linux 5.9 Swift version matrix job."
-        default: ""
       linux_5_10_enabled:
         type: boolean
         description: "Boolean to enable the Linux 5.10 Swift version matrix job. Defaults to true."
@@ -27,13 +19,21 @@ on:
         type: string
         description: "The arguments passed to swift test in the Linux 6.0 Swift version matrix job."
         default: ""
+      linux_6_1_enabled:
+        type: boolean
+        description: "Boolean to enable the Linux 6.1 Swift version matrix job. Defaults to true."
+        default: true
+      linux_6_1_arguments_override:
+        type: string
+        description: "The arguments passed to swift test in the Linux 6.1 Swift version matrix job."
+        default: ""
       linux_nightly_next_enabled:
         type: boolean
-        description: "Boolean to enable the Linux nightly 6.1 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Linux nightly next Swift version matrix job. Defaults to true."
         default: true
       linux_nightly_next_arguments_override:
         type: string
-        description: "The arguments passed to swift test in the Linux nightly 6.1 Swift version matrix job."
+        description: "The arguments passed to swift test in the Linux nightly next Swift version matrix job."
         default: ""
       linux_nightly_main_enabled:
         type: boolean
@@ -53,15 +53,15 @@ jobs:
       matrix:
         # We are specifying only the major and minor of the docker images to automatically pick up the latest patch release
         swift:
-          - image: "swift:5.9-jammy"
-            swift_version: "5.9"
-            enabled: ${{ inputs.linux_5_9_enabled }}
           - image: "swift:5.10-jammy"
             swift_version: "5.10"
             enabled: ${{ inputs.linux_5_10_enabled }}
           - image: "swift:6.0-jammy"
             swift_version: "6.0"
             enabled: ${{ inputs.linux_6_0_enabled }}
+          - image: "swift:6.1-jammy"
+            swift_version: "6.1"
+            enabled: ${{ inputs.linux_6_1_enabled }}
           - image: "swiftlang/swift:nightly-6.1-jammy"
             swift_version: "nightly-6.1"
             enabled: ${{ inputs.linux_nightly_next_enabled }}
@@ -84,9 +84,10 @@ jobs:
         env:
           SWIFT_VERSION: ${{ matrix.swift.swift_version }}
           COMMAND: "swift test"
-          COMMAND_OVERRIDE_5_9: "swift test ${{ inputs.linux_5_9_arguments_override }}"
+          COMMAND_OVERRIDE_5_9: ""
           COMMAND_OVERRIDE_5_10: "swift test ${{ inputs.linux_5_10_arguments_override }}"
           COMMAND_OVERRIDE_6_0: "swift test ${{ inputs.linux_6_0_arguments_override }}"
+          COMMAND_OVERRIDE_6_1: "swift test ${{ inputs.linux_6_1_arguments_override }}"
           COMMAND_OVERRIDE_NIGHTLY_NEXT: "swift test ${{ inputs.linux_nightly_next_arguments_override }}"
           COMMAND_OVERRIDE_NIGHTLY_MAIN: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
         run: |

Benchmarks/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version:5.10
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the SwiftCertificates open source project

Benchmarks/Thresholds/5.9/MemcacheBenchmarks.Decrement_Request.p90.json

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version:5.10
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the swift-memcache-gsoc open source project