Skip to content

Commit be79f4d

Browse files
committed
ci: split linux_android job into separate linux and android jobs
- Split combined linux_android job into separate linux and android jobs for better isolation - Uncomment library-evolution job that was previously commented out - Improve CI workflow organization and maintainability
1 parent 064f128 commit be79f4d

File tree

1 file changed

+22
-37
lines changed

1 file changed

+22
-37
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,40 @@ jobs:
104104
if: matrix.skip_release != '1'
105105
run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Release PLATFORM="${{ matrix.platform }}" xcodebuild
106106

107-
linux_android:
108-
name: Linux and Android
109-
runs-on: ubuntu-24.04
107+
linux:
108+
name: Linux
109+
runs-on: ubuntu-latest
110110
steps:
111111
- uses: actions/checkout@v4
112112
- name: "Remove IntegrationTests"
113113
run: rm -r Tests/IntegrationTests/*
114-
- name: "Build Swift Package on Linux"
114+
- name: "Build Swift Package"
115115
run: swift build
116-
- name: "Test Swift Package on Android"
116+
117+
android:
118+
name: Android
119+
runs-on: ubuntu-latest
120+
steps:
121+
- uses: actions/checkout@v4
122+
- name: "Remove IntegrationTests"
123+
run: rm -r Tests/IntegrationTests/*
124+
- name: "Test Swift Package"
117125
uses: skiptools/swift-android-action@v2
118126
with:
119127
# need to copy over the Tests folder because it contains __Snapshots__
120128
copy-files: Tests
121129
# tests are not yet passing on Android
122130
run-tests: false
123131

124-
# linux:
125-
# name: linux
126-
# strategy:
127-
# matrix:
128-
# swift-version: ["5.10"]
129-
# runs-on: ubuntu-latest
130-
# steps:
131-
# - uses: actions/checkout@v4
132-
# - uses: swift-actions/setup-swift@v2
133-
# with:
134-
# swift-version: ${{ matrix.swift-version }}
135-
# - name: Cache build
136-
# uses: actions/cache@v3
137-
# with:
138-
# path: |
139-
# .build
140-
# key: |
141-
# build-spm-linux-${{ matrix.swift-version }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift', '**/Package.resolved') }}
142-
# restore-keys: |
143-
# build-spm-linux-${{ matrix.swift-version }}-
144-
# - name: Run tests
145-
# run: swift test --skip IntegrationTests
146-
147-
# library-evolution:
148-
# name: Library (evolution)
149-
# runs-on: macos-14
150-
# steps:
151-
# - uses: actions/checkout@v4
152-
# - name: Select Xcode 15.4
153-
# run: sudo xcode-select -s /Applications/Xcode_15.4.app
154-
# - name: Build for library evolution
155-
# run: make build-for-library-evolution
132+
library-evolution:
133+
name: Library (evolution)
134+
runs-on: macos-14
135+
steps:
136+
- uses: actions/checkout@v4
137+
- name: Select Xcode 15.4
138+
run: sudo xcode-select -s /Applications/Xcode_15.4.app
139+
- name: Build for library evolution
140+
run: make build-for-library-evolution
156141

157142
examples:
158143
name: Examples

0 commit comments

Comments
 (0)