Skip to content

Commit 0cb0e28

Browse files
committed
ci: combine install steps
1 parent 8049a75 commit 0cb0e28

File tree

2 files changed

+10
-29
lines changed

2 files changed

+10
-29
lines changed

.github/workflows/ci-post-merge.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ jobs:
3535
with:
3636
toolchain: nightly
3737

38-
- uses: taiki-e/[email protected]
38+
- name: Install cargo-hack and cargo-ci-cache-clean
39+
uses: taiki-e/[email protected]
3940
with:
40-
tool: cargo-hack
41+
tool: cargo-hack,cargo-ci-cache-clean
4142

4243
- name: check minimal
4344
run: cargo ci-min
@@ -52,15 +53,9 @@ jobs:
5253
timeout-minutes: 40
5354
run: cargo ci-test
5455

55-
- name: Install cargo-ci-cache-clean
56-
uses: taiki-e/[email protected]
57-
with:
58-
tool: cargo-ci-cache-clean
59-
6056
- name: CI cache clean
6157
run: cargo-ci-cache-clean
6258

63-
6459
build_and_test_other_nightly:
6560
strategy:
6661
fail-fast: false
@@ -81,9 +76,10 @@ jobs:
8176
with:
8277
toolchain: nightly
8378

84-
- uses: taiki-e/[email protected]
79+
- name: Install cargo-hack and cargo-ci-cache-clean
80+
uses: taiki-e/[email protected]
8581
with:
86-
tool: cargo-hack
82+
tool: cargo-hack,cargo-ci-cache-clean
8783

8884
- name: check minimal
8985
run: cargo ci-min
@@ -98,10 +94,5 @@ jobs:
9894
timeout-minutes: 40
9995
run: cargo ci-test --exclude=actix-redis --exclude=actix-session --exclude=actix-limitation -- --nocapture
10096

101-
- name: Install cargo-ci-cache-clean
102-
uses: taiki-e/[email protected]
103-
with:
104-
tool: cargo-ci-cache-clean
105-
10697
- name: CI cache clean
10798
run: cargo-ci-cache-clean

.github/workflows/ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
with:
4949
toolchain: ${{ matrix.version.version }}
5050

51-
- name: Install cargo-hack
51+
- name: Install cargo-hack and cargo-ci-cache-clean
5252
uses: taiki-e/[email protected]
5353
with:
54-
tool: cargo-hack
54+
tool: cargo-hack,cargo-ci-cache-clean
5555

5656
# - name: workaround MSRV issues
5757
# if: matrix.version.name == 'msrv'
@@ -71,11 +71,6 @@ jobs:
7171
timeout-minutes: 40
7272
run: cargo ci-test
7373

74-
- name: Install cargo-ci-cache-clean
75-
uses: taiki-e/[email protected]
76-
with:
77-
tool: cargo-ci-cache-clean
78-
7974
- name: CI cache clean
8075
run: cargo-ci-cache-clean
8176

@@ -102,10 +97,10 @@ jobs:
10297
with:
10398
toolchain: ${{ matrix.version.version }}
10499

105-
- name: Install cargo-hack
100+
- name: Install cargo-hack and cargo-ci-cache-clean
106101
uses: taiki-e/[email protected]
107102
with:
108-
tool: cargo-hack
103+
tool: cargo-hack,cargo-ci-cache-clean
109104

110105
# - name: workaround MSRV issues
111106
# if: matrix.version.name == 'msrv'
@@ -125,11 +120,6 @@ jobs:
125120
timeout-minutes: 40
126121
run: cargo ci-test --exclude=actix-redis --exclude=actix-session --exclude=actix-limitation
127122

128-
- name: Install cargo-ci-cache-clean
129-
uses: taiki-e/[email protected]
130-
with:
131-
tool: cargo-ci-cache-clean
132-
133123
- name: CI cache clean
134124
run: cargo-ci-cache-clean
135125

0 commit comments

Comments
 (0)