From 0cb0e28208a82ff9af53dd5e7bbe22c87c54d2b9 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Tue, 26 Dec 2023 04:05:35 +0000 Subject: [PATCH] ci: combine install steps --- .github/workflows/ci-post-merge.yml | 21 ++++++--------------- .github/workflows/ci.yml | 18 ++++-------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml index 1ea9fcaab..1e75888f5 100644 --- a/.github/workflows/ci-post-merge.yml +++ b/.github/workflows/ci-post-merge.yml @@ -35,9 +35,10 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.23.1 + - name: Install cargo-hack and cargo-ci-cache-clean + uses: taiki-e/install-action@v2.23.1 with: - tool: cargo-hack + tool: cargo-hack,cargo-ci-cache-clean - name: check minimal run: cargo ci-min @@ -52,15 +53,9 @@ jobs: timeout-minutes: 40 run: cargo ci-test - - name: Install cargo-ci-cache-clean - uses: taiki-e/install-action@v2.23.2 - with: - tool: cargo-ci-cache-clean - - name: CI cache clean run: cargo-ci-cache-clean - build_and_test_other_nightly: strategy: fail-fast: false @@ -81,9 +76,10 @@ jobs: with: toolchain: nightly - - uses: taiki-e/install-action@v2.23.1 + - name: Install cargo-hack and cargo-ci-cache-clean + uses: taiki-e/install-action@v2.23.1 with: - tool: cargo-hack + tool: cargo-hack,cargo-ci-cache-clean - name: check minimal run: cargo ci-min @@ -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/install-action@v2.23.2 - with: - tool: cargo-ci-cache-clean - - name: CI cache clean run: cargo-ci-cache-clean diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1c98657f..93e968097 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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/install-action@v2.23.1 with: - tool: cargo-hack + tool: cargo-hack,cargo-ci-cache-clean # - name: workaround MSRV issues # if: matrix.version.name == 'msrv' @@ -71,11 +71,6 @@ jobs: timeout-minutes: 40 run: cargo ci-test - - name: Install cargo-ci-cache-clean - uses: taiki-e/install-action@v2.23.2 - with: - tool: cargo-ci-cache-clean - - name: CI cache clean run: cargo-ci-cache-clean @@ -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/install-action@v2.23.1 with: - tool: cargo-hack + tool: cargo-hack,cargo-ci-cache-clean # - name: workaround MSRV issues # if: matrix.version.name == 'msrv' @@ -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/install-action@v2.23.2 - with: - tool: cargo-ci-cache-clean - - name: CI cache clean run: cargo-ci-cache-clean