Skip to content

Commit 0246973

Browse files
committed
Fix CI config
1 parent db41b08 commit 0246973

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

.github/workflows/test.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ jobs:
2222
swift --version
2323
xcodebuild -version
2424
25-
- name: Get ruby gem cache
26-
id: gem-cache
27-
uses: actions/cache@v2
28-
with:
29-
path: vendor/bundle
30-
key: ${{ runner.os }}-1-gem-${{ hashFiles('Gemfile.lock') }}
31-
restore-keys: ${{ runner.os }}-1-gem-
32-
3325
- name: Get npm cache
3426
id: npm-cache
3527
uses: actions/cache@v2
@@ -38,18 +30,26 @@ jobs:
3830
key: ${{ runner.os }}-0-npm-${{ hashFiles('package-lock.json') }}
3931
restore-keys: ${{ runner.os }}-0-npm-
4032

33+
- name: Get ruby gem cache
34+
id: gem-cache
35+
uses: actions/cache@v2
36+
with:
37+
path: vendor/bundle
38+
key: ${{ runner.os }}-1-gem-${{ hashFiles('Gemfile.lock') }}
39+
restore-keys: ${{ runner.os }}-1-gem-
40+
4141
- name: Get SwiftPM cache
4242
uses: actions/cache@v2
4343
with:
4444
path: Tools/.build
45-
key: ${{ runner.os }}-${{ matrix.xcode_version }}-2-spm-${{ hashFiles('Tools/Package.resolved') }}
46-
restore-keys: ${{ runner.os }}-${{ matrix.xcode_version }}-2-spm-
45+
key: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-${{ hashFiles('Tools/Package.resolved') }}
46+
restore-keys: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-
4747

4848
- name: Get CocoaPods cache
4949
id: cocoapods-cache
5050
uses: actions/cache@v2
5151
with:
52-
path: Pods
52+
path: Example/Pods
5353
key: ${{ runner.os }}-1-cocoapods-${{ hashFiles('Example/Podfile.lock') }}
5454
restore-keys: ${{ runner.os }}-1-cocoapods-
5555

@@ -61,14 +61,15 @@ jobs:
6161
if: steps.gem-cache.cache.outputs.cache-hit != 'true'
6262
run: make gem
6363

64-
- name: Podspec lint
65-
run: make pod-lib-lint
66-
6764
- name: Validation
68-
run: make all && [ -z "$(git status --porcelain)" ] && make lint
65+
if: matrix.xcode_version == '12.5.1'
66+
run: |
67+
make all && [ -z "$(git status --porcelain)" ]
68+
make lint
69+
make pod-lib-lint
6970
7071
- name: Generate snapshots
71-
run: set -o pipefail && xcodebuild build-for-testing test-without-building -workspace Example/Example.xcworkspace -scheme SampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12 Pro' ENABLE_TESTABILITY=YES | xcpretty -c
72+
run: xcodebuild test -workspace Example/Example.xcworkspace -scheme SampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12 Pro' ENABLE_TESTABILITY=YES | xcpretty -c
7273

7374
- name: Visual regression test
7475
if: matrix.xcode_version == '12.5.1'

0 commit comments

Comments
 (0)