From 76287e3f5ac43b245ed9dad900de9beb5e55fae4 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 10 Oct 2024 06:48:33 +0200 Subject: [PATCH] WIP share cargo registry cache between all jobs --- .github/workflows/builds.yml | 126 ++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 62 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 1f9f5204e5a..55bceaec868 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -73,8 +73,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -322,8 +322,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -402,8 +402,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -474,8 +474,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -578,8 +578,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -672,8 +672,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -768,8 +768,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -962,8 +962,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -1233,8 +1233,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -1304,8 +1304,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 @@ -1360,8 +1360,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -1434,8 +1434,9 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry + - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -1559,8 +1560,9 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry + - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -1673,8 +1675,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -1819,8 +1821,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -1906,8 +1908,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2009,8 +2011,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2118,8 +2120,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2214,8 +2216,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2278,8 +2280,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2369,8 +2371,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2700,8 +2702,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2798,8 +2800,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry # Setup apt package caching. - name: Setup apt package caching @@ -2903,8 +2905,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -2995,8 +2997,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -3077,8 +3079,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Determine number of CPUs run: echo CPUS=$(nproc --all) >> $GITHUB_ENV @@ -3155,8 +3157,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - run: | brew install \ autoconf \ @@ -3220,8 +3222,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: windows-msys2-mingw64-cargo + path: ~/.cargo/registry + key: cargo-registry - uses: msys2/setup-msys2@v2 with: msystem: MINGW64 @@ -3276,8 +3278,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: windows-msys2-mingw64-cargo + path: ~/.cargo/registry + key: cargo-registry - uses: msys2/setup-msys2@v2 with: msystem: MINGW64 @@ -3320,8 +3322,8 @@ jobs: - name: Cache ~/.cargo uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: windows-msys2-mingw64-cargo + path: ~/.cargo/registry + key: cargo-registry - uses: msys2/setup-msys2@v2 with: msystem: MINGW64 @@ -3366,8 +3368,8 @@ jobs: - name: Cache cargo registry uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: - path: ~/.cargo - key: ${{ github.job }}-cargo + path: ~/.cargo/registry + key: cargo-registry - name: Cache RPMs uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2