Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17238 - Veykril:metrics-caching, r=Veykril
Fix metrics workflow not actually updating the toolchain
The install won't persist across jobs
| -rw-r--r-- | .github/workflows/metrics.yaml | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/.github/workflows/metrics.yaml b/.github/workflows/metrics.yaml index 377a6898ec..9771d120ab 100644 --- a/.github/workflows/metrics.yaml +++ b/.github/workflows/metrics.yaml @@ -11,32 +11,22 @@ env: RUSTUP_MAX_RETRIES: 10 jobs: - setup_cargo: + build_metrics: if: github.repository == 'rust-lang/rust-analyzer' runs-on: ubuntu-latest + steps: - name: Install Rust toolchain run: | rustup update --no-self-update stable rustup default stable - rustup component add --toolchain stable rustfmt rust-src - - - name: Cache cargo - uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012 - with: - key: ${{ runner.os }}-cargo-${{ github.sha }} - cache-targets: "false" + rustup component add --toolchain stable rust-src - build_metrics: - runs-on: ubuntu-latest - needs: setup_cargo - - steps: - name: Checkout repository uses: actions/checkout@v4 - name: Restore cargo cache - uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012 + uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609 with: key: ${{ runner.os }}-cargo-${{ github.sha }} cache-targets: "false" @@ -45,7 +35,7 @@ jobs: run: cargo xtask metrics build - name: Cache target - uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012 + uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609 with: key: ${{ runner.os }}-cargo-${{ github.sha }} cache-targets: "true" @@ -62,14 +52,20 @@ jobs: matrix: names: [self, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18] runs-on: ubuntu-latest - needs: [setup_cargo, build_metrics] + needs: build_metrics steps: + - name: Install Rust toolchain + run: | + rustup update --no-self-update stable + rustup default stable + rustup component add --toolchain stable rust-src + - name: Checkout repository uses: actions/checkout@v4 - name: Restore cargo cache - uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012 + uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609 with: key: ${{ runner.os }}-cargo-${{ github.sha }} cache-targets: "true" |