From 10b5ea35584a5d6464fba19274f7a8a93a604e4c Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 14 Nov 2024 11:29:47 -0500 Subject: [PATCH 1/5] fix ci --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ffe8364..dc3d8cb 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -228,6 +228,8 @@ jobs: os: macos-14 - swift: ~5.9 os: macos-14 + - swift: ~5.10 + os: macos-14 steps: - uses: actions/checkout@v4 - uses: ./ From 2254d99764b2d3b2ed726788805c3dc7fe26153d Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 14 Nov 2024 11:54:35 -0500 Subject: [PATCH 2/5] wip --- fixtures/swift/~5.10/Package.swift | 22 ++++++++++++++++++++++ fixtures/swift/~5.10/code.swift | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 fixtures/swift/~5.10/Package.swift create mode 100644 fixtures/swift/~5.10/code.swift diff --git a/fixtures/swift/~5.10/Package.swift b/fixtures/swift/~5.10/Package.swift new file mode 100644 index 0000000..2ab862a --- /dev/null +++ b/fixtures/swift/~5.10/Package.swift @@ -0,0 +1,22 @@ +// swift-tools-version:5.0 + +import PackageDescription + +let name = "my-fixture" + +let pkg = Package( + name: name, + products: [ + .library(name: name, targets: [name]), + ], + targets: [ + .target(name: name, path: ".", sources: ["code.swift"]), + ] +) + +pkg.platforms = [ + .macOS(.v10_10), + .iOS(.v9), + .tvOS(.v9), + .watchOS(.v3) +] diff --git a/fixtures/swift/~5.10/code.swift b/fixtures/swift/~5.10/code.swift new file mode 100644 index 0000000..aaad815 --- /dev/null +++ b/fixtures/swift/~5.10/code.swift @@ -0,0 +1,3 @@ +#if swift(>=5.11) || swift(<5.10) +#error("Swift version seems to be wrong") +#endif From 83fa3dd05d1ef54bd043e57109a14df6464ff648 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 14 Nov 2024 12:02:14 -0500 Subject: [PATCH 3/5] wip --- .github/workflows/checks.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index dc3d8cb..d72b60c 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -215,6 +215,7 @@ jobs: name: swift ${{ matrix.x.swift }} runs-on: ${{ matrix.x.os }} needs: [verify-dist] + continue-on-error: true strategy: matrix: x: @@ -225,7 +226,7 @@ jobs: - swift: ~5.7 os: macos-13 - swift: ~5.8 - os: macos-14 + os: macos-13 - swift: ~5.9 os: macos-14 - swift: ~5.10 @@ -245,6 +246,7 @@ jobs: name: ${{ matrix.platform }} (${{ matrix.action }}, ${{ matrix.xcode }}${{ matrix.codecov && ', cc' || ''}}${{ matrix.job-name-sufix }}) runs-on: ${{ matrix.os || 'macos-12' }} needs: [verify-dist] + continue-on-error: true strategy: matrix: platform: From 1ca3139bba54a5f7f05b28a6b2572a1944e923ab Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 14 Nov 2024 12:58:03 -0500 Subject: [PATCH 4/5] wip --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d72b60c..3fc7af0 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -268,7 +268,7 @@ jobs: platform: iOS platform-version: ^16 os: macos-14 - xcode: ^14 + xcode: ^13 - platform: mac-catalyst xcode: ^13 codecov: false From e15931d5df7bb86ff32b507c6df48a18df48edf8 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 14 Nov 2024 13:06:01 -0500 Subject: [PATCH 5/5] wip --- .github/workflows/checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3fc7af0..d481062 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -267,8 +267,8 @@ jobs: - job-name-sufix: ', platform-version ^16' platform: iOS platform-version: ^16 - os: macos-14 - xcode: ^13 + os: macos-13 + xcode: ^14 - platform: mac-catalyst xcode: ^13 codecov: false