Skip to content

Commit 8337e8d

Browse files
committed
Cleanup CI workflow.
1 parent 3184ca3 commit 8337e8d

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,10 @@ jobs:
1616
xcode:
1717
- 11.4
1818
- 11.5
19+
- 11.6
1920
steps:
2021
- uses: actions/checkout@v2
2122
- name: Select Xcode ${{ matrix.xcode }}
2223
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
2324
- name: Run tests
24-
run: make test-swift
25-
26-
examples:
27-
runs-on: macOS-latest
28-
strategy:
29-
matrix:
30-
xcode:
31-
- 11.4
32-
- 11.5
33-
steps:
34-
- uses: actions/checkout@v2
35-
- name: Select Xcode ${{ matrix.xcode }}
36-
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
37-
- name: Run tests
38-
run: make test-workspace
25+
run: make test

Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@ PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
22
PLATFORM_MACOS = macOS
33
PLATFORM_TVOS = tvOS Simulator,name=Apple TV 4K (at 1080p)
44

5-
default: test-all
5+
default: test
66

7-
test-all: test-swift test-workspace
8-
9-
test-swift:
10-
swift test \
11-
--enable-pubgrub-resolver \
12-
--enable-test-discovery \
13-
--parallel
14-
15-
test-workspace:
7+
test:
168
instruments -s devices
179
xcodebuild test \
1810
-scheme ComposableArchitecture \
@@ -70,4 +62,4 @@ format:
7062
swift format --in-place --recursive \
7163
./Examples ./Package.swift ./Sources ./Tests
7264

73-
.PHONY: format test-all test-swift test-workspace
65+
.PHONY: format test

0 commit comments

Comments
 (0)