From e14efc6ca2124fb0300c7eb4e2a2bc61a3d77c06 Mon Sep 17 00:00:00 2001 From: iTrooz Date: Wed, 4 Oct 2023 22:23:41 +0200 Subject: [PATCH] git: Remove CACHE_VERSION secret from cache keys (#1343) Rationale: secrets (and vars) are not shared with pull requests, so they can't use the cache This PR fix that --- .github/workflows/analysis.yml | 6 ++--- .github/workflows/build.yml | 42 ++++++++++++++++----------------- .github/workflows/build_web.yml | 4 ++-- .github/workflows/tests.yml | 6 ++--- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 3fbff2e3c..d155fa2a6 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -28,8 +28,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ runner.os }}-analysis-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }} - restore-keys: ${{ runner.os }}-analysis-${{ secrets.CACHE_VERSION }}-build + key: ${{ runner.os }}-analysis-build-${{ github.run_id }} + restore-keys: ${{ runner.os }}-analysis-build max-size: 50M - name: 📜 Restore CMakeCache @@ -37,7 +37,7 @@ jobs: with: path: | build/CMakeCache.txt - key: ${{ runner.os }}-analysis-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }} + key: ${{ runner.os }}-analysis-build-${{ hashFiles('**/CMakeLists.txt') }} - name: ⬇️ Install dependencies run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f98f821d4..53be2c993 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,8 +30,8 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 id: cache-ccache with: - key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-ccache-${{ github.run_id }} - restore-keys: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-ccache + key: ${{ runner.os }}-ccache-${{ github.run_id }} + restore-keys: ${{ runner.os }}-ccache max-size: 1G - name: 📜 Restore CMakeCache @@ -39,7 +39,7 @@ jobs: with: path: | build/CMakeCache.txt - key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} + key: ${{ runner.os }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - name: 🟦 Install msys2 uses: msys2/setup-msys2@v2 @@ -149,8 +149,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ runner.os }}${{ matrix.suffix }}-${{ secrets.CACHE_VERSION }}-ccache-${{ github.run_id }} - restore-keys: ${{ runner.os }}${{ matrix.suffix }}-${{ secrets.CACHE_VERSION }}-ccache + key: ${{ runner.os }}${{ matrix.suffix }}-ccache-${{ github.run_id }} + restore-keys: ${{ runner.os }}${{ matrix.suffix }}-ccache max-size: 1G - name: 📜 Restore CMakeCache @@ -158,7 +158,7 @@ jobs: with: path: | build/CMakeCache.txt - key: ${{ runner.os }}-${{ matrix.suffix }}-${{ secrets.CACHE_VERSION }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} + key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - name: ⬇️ Install dependencies run: | @@ -263,8 +263,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: Ubuntu-${{matrix.release_num}}-${{ secrets.CACHE_VERSION }}-ccache-${{ github.run_id }} - restore-keys: Ubuntu-${{matrix.release_num}}-${{ secrets.CACHE_VERSION }}-ccache + key: Ubuntu-${{matrix.release_num}}-ccache-${{ github.run_id }} + restore-keys: Ubuntu-${{matrix.release_num}}-ccache max-size: 1G - name: 📜 Restore CMakeCache @@ -272,7 +272,7 @@ jobs: with: path: | build/CMakeCache.txt - key: Ubuntu-${{matrix.release_num}}-${{ secrets.CACHE_VERSION }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} + key: Ubuntu-${{matrix.release_num}}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - name: ⬇️ Install dependencies run: | @@ -341,8 +341,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: appimage-${{ secrets.CACHE_VERSION }}-ccache-${{ github.run_id }} - restore-keys: appimage-${{ secrets.CACHE_VERSION }}-ccache + key: appimage-ccache-${{ github.run_id }} + restore-keys: appimage-ccache max-size: 1G - name: 📜 Restore CMakeCache @@ -350,7 +350,7 @@ jobs: with: path: | build-appimage/CMakeCache.txt - key: appimage-${{ secrets.CACHE_VERSION }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} + key: appimage-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - name: ⬇️ Install dependencies run: | @@ -437,8 +437,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: archlinux-${{ secrets.CACHE_VERSION }}-ccache-${{ github.run_id }} - restore-keys: archlinux-${{ secrets.CACHE_VERSION }}-ccache + key: archlinux-ccache-${{ github.run_id }} + restore-keys: archlinux-ccache max-size: 1G - name: 📜 Restore CMakeCache @@ -446,7 +446,7 @@ jobs: with: path: | build/CMakeCache.txt - key: archlinux-${{ secrets.CACHE_VERSION }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} + key: archlinux-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} # ArchLinux cmake build - name: 🛠️ Build @@ -547,9 +547,9 @@ jobs: uses: actions/cache@v3 with: path: /var/cache/dnf - key: ${{ matrix.mock_release }}-${{secrets.CACHE_VERSION }}-dnf-${{ github.run_id }} + key: ${{ matrix.mock_release }}-dnf-${{ github.run_id }} restore-keys: | - ${{ matrix.mock_release }}-${{secrets.CACHE_VERSION }}-dnf- + ${{ matrix.mock_release }}-dnf- - name: ⬇️ Update all packages and install dependencies run: | @@ -566,8 +566,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2.5 with: - key: ${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-rpm-${{ github.run_id }} - restore-keys: ${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-rpm + key: ${{ matrix.mock_release }}-rpm-${{ github.run_id }} + restore-keys: ${{ matrix.mock_release }}-rpm max-size: 1G - name: 📜 Set version variable @@ -608,9 +608,9 @@ jobs: uses: actions/cache@v3 with: path: /var/cache/mock - key: ${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-mock-${{ github.run_id }} + key: ${{ matrix.mock_release }}-mock-${{ github.run_id }} restore-keys: | - ${{ matrix.mock_release }}-${{ secrets.CACHE_VERSION }}-mock + ${{ matrix.mock_release }}-mock # Fedora cmake build (in imhex.spec) - name: 📦 Build RPM diff --git a/.github/workflows/build_web.yml b/.github/workflows/build_web.yml index 75034797b..40f0d389a 100644 --- a/.github/workflows/build_web.yml +++ b/.github/workflows/build_web.yml @@ -29,7 +29,7 @@ jobs: uses: actions/cache@v3 with: path: cache - key: build-web-cache-${{ secrets.CACHE_VERSION }} + key: build-web-cache - name: 🐳 Inject /cache into docker uses: reproducible-containers/buildkit-cache-dance@v2.1.2 @@ -59,7 +59,7 @@ jobs: GH_TOKEN: ${{ github.token }} run: | gh extension install actions/gh-actions-cache - gh actions-cache delete "build-web-cache-${{ secrets.CACHE_VERSION }}" --confirm + gh actions-cache delete "build-web-cache" --confirm deploy: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1f44af1cf..c0fbec44c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,8 +25,8 @@ jobs: - name: 📜 Setup ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ runner.os }}-tests-${{ secrets.CACHE_VERSION }}-build-${{ github.run_id }} - restore-keys: ${{ runner.os }}-tests-${{ secrets.CACHE_VERSION }}-build + key: ${{ runner.os }}-tests-build-${{ github.run_id }} + restore-keys: ${{ runner.os }}-tests-build max-size: 50M @@ -35,7 +35,7 @@ jobs: with: path: | build/CMakeCache.txt - key: ${{ runner.os }}-tests-${{ secrets.CACHE_VERSION }}-build-${{ hashFiles('**/CMakeLists.txt') }} + key: ${{ runner.os }}-tests-build-${{ hashFiles('**/CMakeLists.txt') }} - name: ⬇️ Install dependencies run: |