Skip to content

Commit c3aa2b0

Browse files
committed
Update GitHub CI
1 parent efd22e6 commit c3aa2b0

1 file changed

Lines changed: 31 additions & 27 deletions

File tree

.github/workflows/swift.yml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,52 @@ jobs:
55
macos:
66
name: macOS
77
runs-on: macos-15
8+
strategy:
9+
matrix:
10+
config: ["debug", "release"]
11+
options: ["", "SWIFT_BUILD_DYNAMIC_LIBRARY=1"]
812
steps:
913
- name: Checkout
1014
uses: actions/checkout@v4
1115
- name: Swift Version
1216
run: swift --version
13-
- name: Build (Debug)
14-
run: swift build -c debug
15-
- name: Build (Release)
16-
run: swift build -c release
17-
- name: Test (Debug)
18-
run: swift test -c debug
17+
- name: Build
18+
run: ${{ matrix.options }} swift build -c ${{ matrix.config }}
19+
- name: Test
20+
run: ${{ matrix.options }} swift test -c ${{ matrix.config }}
1921

2022
linux:
2123
name: Linux
2224
strategy:
2325
matrix:
24-
container: ["swift:6.0.3", "swift:6.1.1", "swiftlang/swift:nightly"]
26+
container: ["swift:6.0.3", "swift:6.1.2"]
27+
config: ["debug", "release"]
28+
options: ["", "SWIFT_BUILD_DYNAMIC_LIBRARY=1"]
2529
runs-on: ubuntu-latest
2630
container: ${{ matrix.container }}-jammy
2731
steps:
2832
- name: Checkout
2933
uses: actions/checkout@v4
3034
- name: Swift Version
3135
run: swift --version
32-
- name: Build (Debug)
33-
run: swift build -c debug --build-tests
34-
- name: Build (Release)
35-
run: swift build -c release
36+
- name: Build
37+
run: ${{ matrix.options }} swift build -c ${{ matrix.config }}
38+
- name: Test
39+
run: ${{ matrix.options }} swift test -c ${{ matrix.config }}
3640

37-
android:
38-
name: Android
39-
strategy:
40-
fail-fast: false
41-
matrix:
42-
swift: ['6.1', 'nightly-6.2']
43-
runs-on: macos-15
44-
timeout-minutes: 30
45-
steps:
46-
- uses: actions/checkout@v4
47-
- name: "Build Swift Package for Android"
48-
run: |
49-
brew install skiptools/skip/skip || (brew update && brew install skiptools/skip/skip)
50-
skip android sdk install --version ${{ matrix.swift }}
51-
# https://github.com/swiftlang/swift-driver/pull/1879
52-
ANDROID_NDK_ROOT="" skip android build --build-tests
41+
android-arm:
42+
name: Android
43+
strategy:
44+
fail-fast: false
45+
matrix:
46+
swift: ['6.1', 'nightly-6.2']
47+
arch: ["aarch64", "x86_64"]
48+
runs-on: macos-15
49+
timeout-minutes: 30
50+
steps:
51+
- uses: actions/checkout@v4
52+
- name: "Build Swift Package for Android"
53+
run: |
54+
brew install skiptools/skip/skip || (brew update && brew install skiptools/skip/skip)
55+
skip android sdk install --version ${{ matrix.swift }}
56+
ANDROID_NDK_ROOT="" skip android build --build-tests --arch ${{ matrix.arch }}

0 commit comments

Comments
 (0)