From bd75b2b6b48c11001bda5df0580f45e4853d9e85 Mon Sep 17 00:00:00 2001 From: Rick Newton-Rogers Date: Mon, 14 Apr 2025 11:26:27 +0100 Subject: [PATCH] Enable Swift 6.1 jobs in CI Motivation: Swift 6.1 has been released, we should add it to our CI coverage. Modifications: Add additional Swift 6.1 jobs where appropriate in main.yml, pull_request.yml Result: Improved test coverage. --- .github/workflows/main.yml | 1 + .github/workflows/pull_request.yml | 1 + .github/workflows/unit_tests.yml | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e5cdc4..734431d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,5 +14,6 @@ jobs: 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" diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 93b37a8..f8cd56a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,6 +18,7 @@ jobs: 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" diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 7bb91e3..d80f33c 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -27,13 +27,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 @@ -62,6 +70,9 @@ jobs: - 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 }} @@ -87,6 +98,7 @@ jobs: COMMAND_OVERRIDE_5_9: "swift test ${{ inputs.linux_5_9_arguments_override }}" 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: |