Skip to content

Commit 48fed0c

Browse files
authored
Merge pull request #357 from argentlabs/run-tests-sequentially
Run tests sequentially
2 parents c5450f8 + 34404d2 commit 48fed0c

File tree

1 file changed

+31
-10
lines changed

1 file changed

+31
-10
lines changed

.github/workflows/CI.yml

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,59 @@ on:
55
branches: [ develop ]
66
workflow_dispatch:
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
9-
lint:
13+
run_lint:
1014
runs-on: macos-latest
15+
1116
steps:
12-
- uses: actions/checkout@v3
13-
# - name: Lint
14-
# run: ./scripts/runSwiftFormat.sh -l
15-
macos:
16-
# needs: lint
17+
- uses: actions/checkout@v4
18+
19+
- name: Lint
20+
run: ./scripts/runSwiftFormat.sh -l
21+
22+
test_macos:
23+
needs: run_lint
24+
1725
runs-on: macos-latest
26+
1827
env:
1928
TESTS_PRIVATEKEY: ${{ secrets.TESTS_PRIVATEKEY }}
29+
2030
steps:
21-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
32+
2233
- name: SetupKey
2334
run: ./scripts/setupKey.sh "${{ secrets.TESTS_PRIVATEKEY }}"
35+
2436
- name: Build
2537
run: swift build -v
38+
2639
- name: Tests
2740
run: swift test -v
28-
linux:
29-
# needs: lint
41+
42+
test_linux:
43+
needs: [run_lint, test_macos]
44+
3045
runs-on: ubuntu-latest
46+
3147
container:
3248
image: swift:5.7-bionic
49+
3350
env:
3451
TESTS_PRIVATEKEY: ${{ secrets.TESTS_PRIVATEKEY }}
52+
3553
steps:
36-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
55+
3756
- name: SetupKey
3857
run: ./scripts/setupKey.sh "${{ secrets.TESTS_PRIVATEKEY }}"
58+
3959
- name: Build
4060
run: swift build -v
61+
4162
- name: Tests
4263
run: swift test -v

0 commit comments

Comments
 (0)