Skip to content

Commit

Permalink
ci: combine install steps
Browse files Browse the repository at this point in the history
  • Loading branch information
robjtede committed Dec 26, 2023
1 parent 8049a75 commit 0cb0e28
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 29 deletions.
21 changes: 6 additions & 15 deletions .github/workflows/ci-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ jobs:
with:
toolchain: nightly

- uses: taiki-e/[email protected]
- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-hack
tool: cargo-hack,cargo-ci-cache-clean

- name: check minimal
run: cargo ci-min
Expand All @@ -52,15 +53,9 @@ jobs:
timeout-minutes: 40
run: cargo ci-test

- name: Install cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-ci-cache-clean

- name: CI cache clean
run: cargo-ci-cache-clean


build_and_test_other_nightly:
strategy:
fail-fast: false
Expand All @@ -81,9 +76,10 @@ jobs:
with:
toolchain: nightly

- uses: taiki-e/[email protected]
- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-hack
tool: cargo-hack,cargo-ci-cache-clean

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

- name: Install cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-ci-cache-clean

- name: CI cache clean
run: cargo-ci-cache-clean
18 changes: 4 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ jobs:
with:
toolchain: ${{ matrix.version.version }}

- name: Install cargo-hack
- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-hack
tool: cargo-hack,cargo-ci-cache-clean

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

- name: Install cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-ci-cache-clean

- name: CI cache clean
run: cargo-ci-cache-clean

Expand All @@ -102,10 +97,10 @@ jobs:
with:
toolchain: ${{ matrix.version.version }}

- name: Install cargo-hack
- name: Install cargo-hack and cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-hack
tool: cargo-hack,cargo-ci-cache-clean

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

- name: Install cargo-ci-cache-clean
uses: taiki-e/[email protected]
with:
tool: cargo-ci-cache-clean

- name: CI cache clean
run: cargo-ci-cache-clean

Expand Down

0 comments on commit 0cb0e28

Please sign in to comment.