From 504bae2c34102c69d8cb37c811076a31cf6fb810 Mon Sep 17 00:00:00 2001 From: John Fairhurst Date: Tue, 29 Apr 2025 10:50:04 +0100 Subject: [PATCH 1/2] Update CI for Xcode 16.3 / Swift 6.1 --- .github/workflows/test.yml | 6 +++--- Tests/RubyGatewayTests/TestMethods.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1575345..163086f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,11 @@ on: jobs: macos: name: macOS Xcode Toolchain - runs-on: macos-14 + runs-on: macos-15 strategy: fail-fast: false matrix: - xcode: ['16.1'] + xcode: ['16.3'] steps: - uses: maxim-lobanov/setup-xcode@v1 with: @@ -80,7 +80,7 @@ jobs: persist-credentials: false - uses: vapor/swiftly-action@v0.1 with: - toolchain: "6.0" + toolchain: "6.1" - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.rby.short }} diff --git a/Tests/RubyGatewayTests/TestMethods.swift b/Tests/RubyGatewayTests/TestMethods.swift index 07da1fe..c27dc97 100644 --- a/Tests/RubyGatewayTests/TestMethods.swift +++ b/Tests/RubyGatewayTests/TestMethods.swift @@ -570,7 +570,7 @@ class TestMethods: XCTestCase { func testUserGuideFunctionExamples() { struct Logger { static nonisolated(unsafe) var logCount = 0 - static nonisolated(unsafe) func log(message: String?, priority: Int? = nil) { + static nonisolated func log(message: String?, priority: Int? = nil) { logCount = logCount + 1 } } From 7092a132625ee09c58254d22299f85517bef18d0 Mon Sep 17 00:00:00 2001 From: John Fairhurst Date: Tue, 29 Apr 2025 11:08:58 +0100 Subject: [PATCH 2/2] Try and fix swiftly --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 163086f..2d94aa8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: vapor/swiftly-action@v0.1 + - uses: vapor/swiftly-action@v0.2 with: toolchain: "6.1" - uses: ruby/setup-ruby@v1