Skip to content

Commit 0eb7c22

Browse files
authored
install swiftly swift to avoid toolchain issues on macos (#500)
1 parent 252a20a commit 0eb7c22

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

.github/workflows/pull_request.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,18 @@ jobs:
153153
uses: ./.github/actions/prepare_env
154154
- name: Swift Build
155155
run: swift build --build-tests --disable-sandbox --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
156-
- name: Swift Test
157-
run: swift test --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
156+
- name: Swift Test (XCTest)
157+
run: swift test --disable-experimental-swift-testing --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
158+
- name: Swift Test (swift-testing)
159+
run: swift test --disable-xctest --disable-experimental-prebuilts # FIXME: until prebuilt swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
158160

159161
test-swift-macos:
160162
name: Test (Swift) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
161163
runs-on: [self-hosted, macos, sequoia, ARM64]
162164
strategy:
163165
fail-fast: false
164166
matrix:
165-
swift_version: ['6.2']
167+
swift_version: ['6.2.3']
166168
os_version: ['macos']
167169
jdk_vendor: ['corretto']
168170
env:
@@ -171,10 +173,16 @@ jobs:
171173
- uses: actions/checkout@v4
172174
- name: Prepare CI Environment
173175
uses: ./.github/actions/prepare_env
176+
- name: Install Swiftly
177+
run: ./.github/scripts/install_swiftly.sh
178+
env:
179+
SWIFT_VERSION: "${{ matrix.swift_version }}"
174180
- name: Swift Build
175181
run: "swift build --build-tests --disable-sandbox"
176-
- name: Swift Test
177-
run: "swift test"
182+
- name: Swift Test (swift-testing)
183+
run: swift test --no-parallel --disable-xctest
184+
- name: Swift Test (XCTest)
185+
run: swift test --no-parallel --disable-experimental-swift-testing
178186

179187
build-swift-android:
180188
name: Sample SwiftJavaExtractJNISampleApp (Android) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} android:${{matrix.sdk_triple}})

0 commit comments

Comments
 (0)