From e38c3ee30057167e6bfb4aab3c9b19ab316c6b2a Mon Sep 17 00:00:00 2001 From: "Chris (SPG) McGee" Date: Fri, 8 Nov 2024 08:18:50 -0500 Subject: [PATCH 1/3] Add ability to include swift versions In some cases, such as swiftly, there's only one particular version of swift that is being targeted at a time. It's problematic trying to exclude all of the others in the default list, and have to adjust when the workflow gets changed, making sure to exclude any additions. Add the ability for a repo like swiftly to set the list to explicit version(s) instead of excluding everything except that one version. --- .github/workflows/swift_package_test.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index 4b5c5ab4..2254a211 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -3,6 +3,10 @@ name: Swift Linux Matrix on: workflow_call: inputs: + linux_swift_versions: + type: string + description: "Include Linux Swift version list (JSON)" + default: "[\"5.8\", \"5.9\", \"5.10\", \"6.0\", \"nightly-main\", \"nightly-6.0\"]" linux_exclude_swift_versions: type: string description: "Exclude Linux Swift version list (JSON)" @@ -11,6 +15,10 @@ on: type: string description: "Linux OS version list (JSON)" default: "[\"jammy\"]" + windows_swift_versions: + type: string + description: "Include Windows Swift version list (JSON)" + default: "[\"5.9\", \"6.0\", \"nightly\", \"nightly-6.0\"]" windows_exclude_swift_versions: type: string description: "Exclude Windows Swift version list (JSON)" @@ -57,7 +65,7 @@ jobs: strategy: fail-fast: false matrix: - swift_version: ['5.8', '5.9', '5.10', '6.0', 'nightly-main', 'nightly-6.0'] + swift_version: ${{ fromJson(inputs.linux_swift_versions) }} os_version: ${{ fromJson(inputs.linux_os_versions) }} exclude: - ${{ fromJson(inputs.linux_exclude_swift_versions) }} @@ -87,7 +95,7 @@ jobs: strategy: fail-fast: false matrix: - swift_version: ['5.9', '6.0', 'nightly', 'nightly-6.0'] + swift_version: ${{ fromJson(inputs.windows_swift_versions) }} exclude: - ${{ fromJson(inputs.windows_exclude_swift_versions) }} steps: From 456bde9fa6e6f513b3e680f9a0283e5cb775aafc Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Thu, 10 Apr 2025 23:25:28 -0700 Subject: [PATCH 2/3] Update .github/workflows/swift_package_test.yml --- .github/workflows/swift_package_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index 52eec719..b5ae4846 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -6,7 +6,7 @@ on: linux_swift_versions: type: string description: "Include Linux Swift version list (JSON)" - default: "[\"5.8\", \"5.9\", \"5.10\", \"6.0\", \"nightly-main\", \"nightly-6.0\"]" + default: "[ \"5.9\", \"5.10\", \"6.0\", \"6.1\", \"nightly-main\", \"nightly-6.1\"]" linux_exclude_swift_versions: type: string description: "Exclude Linux Swift version list (JSON)" From 0dc68b65f6148bfa219ba4d2b8cd4eecae9a2608 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Thu, 10 Apr 2025 23:25:34 -0700 Subject: [PATCH 3/3] Update .github/workflows/swift_package_test.yml --- .github/workflows/swift_package_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index b5ae4846..11099c42 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -18,7 +18,7 @@ on: windows_swift_versions: type: string description: "Include Windows Swift version list (JSON)" - default: "[\"5.9\", \"6.0\", \"nightly\", \"nightly-6.0\"]" + default: "[\"5.9\", \"6.0\", \"6.1\", \"nightly\", \"nightly-6.1\"]" windows_exclude_swift_versions: type: string description: "Exclude Windows Swift version list (JSON)"