Skip to content

Commit fedf9a1

Browse files
committed
Merge branch 'github-actions'
2 parents 6a0115f + 139cff7 commit fedf9a1

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
jobs:
1414

1515
test:
16-
name: Test ${{ matrix.rust }} on ${{ matrix.os }} (${{matrix.update}})
16+
name: ${{ matrix.rust }} ${{ matrix.os }} ${{ join(matrix.extras) }}
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
@@ -22,24 +22,21 @@ jobs:
2222
os: ubuntu-20.04
2323
- rust: 1.39.0
2424
os: ubuntu-20.04
25-
update: true
26-
- rust: 1.39.0
27-
os: macos-latest
25+
extras: [update]
2826
- rust: 1.39.0
2927
os: windows-latest
3028
- rust: 1.39.0
3129
os: windows-latest
32-
update: true
30+
extras: [update]
3331
- rust: stable
3432
os: ubuntu-20.04
35-
update: true
33+
extras: [update]
3634
- rust: nightly
3735
os: ubuntu-20.04
38-
all_targets: true
36+
extras: [all]
3937
- rust: nightly
4038
os: ubuntu-20.04
41-
update: true
42-
all_targets: true
39+
extras: [update, all]
4340

4441
steps:
4542
- name: Checkout
@@ -53,7 +50,7 @@ jobs:
5350
override: true
5451

5552
- name: Update Deps
56-
if: matrix.update
53+
if: ${{ contains(matrix.extras, 'update') }}
5754
uses: actions-rs/cargo@v1
5855
with:
5956
command: update
@@ -69,8 +66,8 @@ jobs:
6966
command: test
7067
args: --features headers
7168

72-
- name: Test all features
73-
if: matrix.all_targets
69+
- name: Test all features/targets
70+
if: ${{ contains(matrix.extras, 'all') }}
7471
uses: actions-rs/cargo@v1
7572
with:
7673
command: test

0 commit comments

Comments
 (0)