From cf6d5c1640c401541be0ed221f976b19ec6965f3 Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Wed, 9 Nov 2022 11:27:56 +0100
Subject: [PATCH] [ci] Set cache_nonce for all jobs, not just those in the
 matrix

---
 .github/actions/nimbus-build-system/action.yml | 7 ++-----
 .github/workflows/ci.yml                       | 5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/actions/nimbus-build-system/action.yml b/.github/actions/nimbus-build-system/action.yml
index 37548e42..b78c5596 100644
--- a/.github/actions/nimbus-build-system/action.yml
+++ b/.github/actions/nimbus-build-system/action.yml
@@ -15,9 +15,6 @@ inputs:
   shell:
     description: "Shell to run commands in"
     default: "bash --noprofile --norc -e -o pipefail"
-  cache_nonce:
-    description: "Change to a new value to ignore previously cached versions"
-    default: 0
 runs:
   using: "composite"
   steps:
@@ -156,8 +153,8 @@ runs:
       uses: actions/cache@v3
       with:
         path: NimBinaries
-        key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ inputs.cache_nonce }}-${{ github.run_id }}
-        restore-keys: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ inputs.cache_nonce }}
+        key: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ env.cache_nonce }}-${{ github.run_id }}
+        restore-keys: ${{ inputs.os }}-${{ inputs.cpu }}-nim-${{ inputs.nim_branch }}-cache-${{ env.cache_nonce }}
 
     - name: Set NIM_COMMIT
       shell: ${{ inputs.shell }} {0}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a25050a..e40b71db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,13 +5,13 @@ on:
       - main
   pull_request:
   workflow_dispatch:
-
+env:
+  cache_nonce: 0 # Allows for easily busting actions/cache caches
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        cache_nonce: [ 0 ] # Allows for easily busting actions/cache caches
         os: [linux, macos, windows]
         include:
           - os: linux
@@ -42,7 +42,6 @@ jobs:
         with:
           os: ${{ matrix.os }}
           shell: ${{ matrix.shell }}
-          cache_nonce: ${{ matrix.cache_nonce }}
 
       - name: Start Ethereum node with Codex contracts
         working-directory: vendor/dagger-contracts