From 6dcaae0ea36d1952d08e2a6e6a1025d96ec49072 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Tue, 1 Apr 2025 14:20:05 -0700 Subject: [PATCH 1/2] Update Swift Package CI to include Swift 6.1 on Linux and Windows --- .github/workflows/swift_package_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index e123f949..697b733f 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -73,7 +73,7 @@ jobs: strategy: fail-fast: false matrix: - swift_version: ['5.9', '5.10', '6.0', 'nightly-main', 'nightly-6.1'] + swift_version: ['5.9', '5.10', '6.0', '6.1', 'nightly-main', 'nightly-6.1'] os_version: ${{ fromJson(inputs.linux_os_versions) }} exclude: - ${{ fromJson(inputs.linux_exclude_swift_versions) }} @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - swift_version: ['5.9', '6.0', 'nightly', 'nightly-6.1'] + swift_version: ['5.9', '6.0', '6.1', 'nightly', 'nightly-6.1'] exclude: - ${{ fromJson(inputs.windows_exclude_swift_versions) }} steps: From 4d13156d3dc0bc5414b42dfe3fec62c930df7fd7 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Tue, 1 Apr 2025 18:12:38 -0700 Subject: [PATCH 2/2] Add Windows install swift script --- .../scripts/windows/swift/install-swift-6.1.ps1 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/scripts/windows/swift/install-swift-6.1.ps1 diff --git a/.github/workflows/scripts/windows/swift/install-swift-6.1.ps1 b/.github/workflows/scripts/windows/swift/install-swift-6.1.ps1 new file mode 100644 index 00000000..e1d0ec06 --- /dev/null +++ b/.github/workflows/scripts/windows/swift/install-swift-6.1.ps1 @@ -0,0 +1,17 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the Swift.org open source project +## +## Copyright (c) 2025 Apple Inc. and the Swift project authors +## Licensed under Apache License v2.0 with Runtime Library Exception +## +## See https://swift.org/LICENSE.txt for license information +## See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +## +##===----------------------------------------------------------------------===## +. $PSScriptRoot\install-swift.ps1 + +$SWIFT='https://download.swift.org/swift-6.1-release/windows10/swift-6.1-RELEASE/swift-6.1-RELEASE-windows10.exe' +$SWIFT_SHA256='8C8AEF8B4A449EBEEFD74482AC767E269F8CBE7E520871C1D103C7079C5F4C6A' + +Install-Swift -Url $SWIFT -Sha256 $SWIFT_SHA256