Skip to content

Commit af4f31b

Browse files
author
Nikola Stojanovic
committed
Simplify test jobs
1 parent b80b006 commit af4f31b

File tree

1 file changed

+6
-67
lines changed

1 file changed

+6
-67
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,14 @@ concurrency:
1313
jobs:
1414
test:
1515
name: Test
16-
strategy:
17-
matrix:
18-
include:
19-
# macOS
20-
- os: macos-14
21-
platform: macos
22-
swift: "6.0"
23-
xcode: "16.1"
24-
25-
# iOS Simulator
26-
- os: macos-14
27-
platform: ios-simulator
28-
swift: "6.0"
29-
xcode: "16.1"
30-
destination: "platform=iOS Simulator,name=Any iOS Simulator Device"
31-
32-
# tvOS Simulator
33-
- os: macos-14
34-
platform: tvos-simulator
35-
swift: "6.0"
36-
xcode: "16.1"
37-
destination: "platform=tvOS Simulator,name=Any tvOS Simulator Device"
38-
39-
# visionOS Simulator
40-
- os: macos-14
41-
platform: visionos-simulator
42-
swift: "6.0"
43-
xcode: "16.1"
44-
destination: "platform=visionOS Simulator,name=Any visionOS Simulator Device"
45-
46-
runs-on: ${{ matrix.os }}
16+
runs-on: macos-14
4717

4818
steps:
4919
- name: Checkout
5020
uses: actions/checkout@v4
5121

5222
- name: Select Xcode Version
53-
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
23+
run: sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
5424

5525
- name: Show Swift Version
5626
run: swift --version
@@ -71,53 +41,22 @@ jobs:
7141
- name: Resolve Dependencies
7242
run: swift package resolve
7343

74-
- name: Build (macOS)
75-
if: matrix.platform == 'macos'
44+
- name: Build
7645
run: swift build --verbose
7746

78-
- name: Test (macOS)
79-
if: matrix.platform == 'macos'
80-
run: |
81-
swift test --verbose --enable-code-coverage --parallel
82-
env:
83-
SWIFTUI_DEBUG_SCAN_VERBOSE: "1"
84-
85-
- name: Build (iOS/tvOS/watchOS/visionOS Simulator)
86-
if: matrix.platform != 'macos'
87-
run: |
88-
xcodebuild build \
89-
-scheme swift-ui-debug-scan \
90-
-destination "${{ matrix.destination }}" \
91-
-skipPackagePluginValidation \
92-
-skipMacroValidation \
93-
CODE_SIGNING_REQUIRED=NO \
94-
CODE_SIGNING_ALLOWED=NO
95-
96-
- name: Test (iOS/tvOS/watchOS/visionOS Simulator)
97-
if: matrix.platform != 'macos'
98-
run: |
99-
xcodebuild test \
100-
-scheme swift-ui-debug-scan \
101-
-destination "${{ matrix.destination }}" \
102-
-skipPackagePluginValidation \
103-
-skipMacroValidation \
104-
-resultBundlePath TestResults \
105-
CODE_SIGNING_REQUIRED=NO \
106-
CODE_SIGNING_ALLOWED=NO \
107-
ENABLE_CODE_COVERAGE=YES
47+
- name: Test
48+
run: swift test --verbose --enable-code-coverage --parallel
10849
env:
10950
SWIFTUI_DEBUG_SCAN_VERBOSE: "1"
11051

111-
- name: Generate Code Coverage (macOS only)
112-
if: matrix.platform == 'macos' && matrix.swift == '6.0'
52+
- name: Generate Code Coverage
11353
run: |
11454
xcrun llvm-cov export \
11555
.build/debug/swift-ui-debug-scanPackageTests.xctest/Contents/MacOS/swift-ui-debug-scanPackageTests \
11656
-instr-profile .build/debug/codecov/default.profdata \
11757
-format="lcov" > coverage.lcov
11858
11959
- name: Upload Code Coverage
120-
if: matrix.platform == 'macos' && matrix.swift == '6.0'
12160
uses: codecov/codecov-action@v4
12261
with:
12362
file: coverage.lcov

0 commit comments

Comments
 (0)