Skip to content

Commit 260f17e

Browse files
committed
Simplify ci.yml
1 parent ce68e9d commit 260f17e

File tree

1 file changed

+16
-60
lines changed

1 file changed

+16
-60
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
branches: [ main ]
2222

2323
jobs:
24-
build-macos:
24+
macos:
2525
strategy:
2626
fail-fast: false
2727
matrix:
@@ -30,76 +30,32 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
steps:
3232
- uses: actions/checkout@v2
33-
- name: Release Build
33+
- name: Test
34+
run: make test
35+
- name: Build for release
3436
run: make build
37+
- name: Install
38+
run: env prefix=/tmp make install
39+
- name: Uninstall
40+
run: env prefix=/tmp make uninstall
3541

36-
test-macos:
42+
linux:
3743
strategy:
3844
fail-fast: false
3945
matrix:
40-
# https://github.com/actions/virtual-environments
41-
os: [macos-12, macos-11]
42-
runs-on: ${{ matrix.os }}
46+
image: ['swift:5.7-focal', 'swift:5.8-focal']
47+
runs-on: ubuntu-latest
48+
container:
49+
image: ${{ matrix.image }}
4350
steps:
4451
- uses: actions/checkout@v2
52+
- run: apt-get -y update && apt-get install make
4553
- name: Test
4654
run: make test
47-
48-
install-macos:
49-
strategy:
50-
fail-fast: false
51-
matrix:
52-
# https://github.com/actions/virtual-environments
53-
os: [macos-12, macos-11]
54-
runs-on: ${{ matrix.os }}
55-
steps:
56-
- uses: actions/checkout@v2
55+
- name: Build for release
56+
run: make build
5757
- name: Install
5858
run: env prefix=/tmp make install
5959
- name: Uninstall
6060
run: env prefix=/tmp make uninstall
61-
62-
build-linux:
63-
strategy:
64-
fail-fast: false
65-
matrix:
66-
image: ['swift:5.7-focal', 'swift:5.8-focal']
67-
runs-on: ubuntu-latest
68-
container:
69-
image: ${{ matrix.image }}
70-
steps:
71-
- uses: actions/checkout@v2
72-
- run: apt-get -y update && apt-get install make
73-
- name: Release Build
74-
run: make build
75-
76-
test-linux:
77-
strategy:
78-
fail-fast: false
79-
matrix:
80-
image: ['swift:5.7-focal', 'swift:5.8-focal']
81-
runs-on: ubuntu-latest
82-
container:
83-
image: ${{ matrix.image }}
84-
steps:
85-
- uses: actions/checkout@v2
86-
- run: apt-get -y update && apt-get install make
87-
- name: Test
88-
run: make test
89-
90-
install-linux:
91-
strategy:
92-
fail-fast: false
93-
matrix:
94-
image: ['swift:5.7-focal', 'swift:5.8-focal']
95-
runs-on: ubuntu-latest
96-
container:
97-
image: ${{ matrix.image }}
98-
steps:
99-
- uses: actions/checkout@v2
100-
- run: apt-get -y update && apt-get install make
101-
- name: Install
102-
run: env prefix=/tmp make install
103-
- name: Uninstall
104-
run: env prefix=/tmp make uninstall
10561

0 commit comments

Comments
 (0)