fix: use resolved node verion in cache keys

Signed-off-by: Reinis Martinsons <[email protected]>

Author: Reinis-FRP

.github/actions/cache-evm-artifacts/action.yml

@@ -14,9 +14,14 @@ outputs:
 runs:
   using: "composite"
   steps:
+    - name: Resolve Node version
+      id: resolved-node
+      uses: ./.github/actions/setup-node-if-needed
+      with:
+        node_version: ${{ inputs.node_version }}
     - name: Cache EVM artifacts
       id: evm-artifacts-cache
       uses: actions/cache@v4
       with:
         path: ${{ inputs.path }}
-        key: evm-artifacts-${{ runner.os }}-node-${{ inputs.node_version }}-${{ hashFiles('yarn.lock', 'hardhat.config.ts', 'contracts/**/*.sol') }}
+        key: evm-artifacts-${{ runner.os }}-node-${{ steps.resolved-node.outputs.version }}-${{ hashFiles('yarn.lock', 'hardhat.config.ts', 'contracts/**/*.sol') }}

.github/actions/cache-svm-artifacts/action.yml

@@ -17,9 +17,14 @@ outputs:
 runs:
   using: "composite"
   steps:
+    - name: Resolve Node version
+      id: resolved-node
+      uses: ./.github/actions/setup-node-if-needed
+      with:
+        node_version: ${{ inputs.node_version }}
     - name: Cache SVM artifacts
       id: svm-artifacts-cache
       uses: actions/cache@v4
       with:
         path: ${{ inputs.path }}
-        key: svm-${{ inputs.type }}-${{ runner.os }}-node-${{ inputs.node_version }}-${{ hashFiles('Cargo.lock', 'programs/**/Cargo.toml', 'programs/**/Xargo.toml', 'programs/**/*.rs') }}
+        key: svm-${{ inputs.type }}-${{ runner.os }}-node-${{ steps.resolved-node.outputs.version }}-${{ hashFiles('Cargo.lock', 'programs/**/Cargo.toml', 'programs/**/Xargo.toml', 'programs/**/*.rs') }}

.github/actions/generate-evm-artifacts/action.yml

@@ -7,10 +7,9 @@ runs:
   using: "composite"
   steps:
     - name: "Use Node ${{ inputs.node_version }}"
-      uses: actions/setup-node@v3
+      uses: ./.github/actions/setup-node-if-needed
       with:
-        node-version: "${{ inputs.node_version }}"
-        cache: yarn
+        node_version: ${{ inputs.node_version }}
     - name: Install packages
       shell: bash
       run: yarn install --frozen-lockfile

.github/actions/generate-svm-artifacts/action.yml

@@ -7,10 +7,9 @@ runs:
   using: "composite"
   steps:
     - name: "Use Node ${{ inputs.node_version }}"
-      uses: actions/setup-node@v3
+      uses: ./.github/actions/setup-node-if-needed
       with:
-        node-version: "${{ inputs.node_version }}"
-        cache: yarn
+        node_version: ${{ inputs.node_version }}
     - name: Setup Anchor & Solana
       uses: ./.github/actions/setup-solana-anchor
       with:

.github/actions/setup-node-if-needed/action.yml

@@ -0,0 +1,31 @@
+name: Setup Node if needed
+description: "Set up Node.js if it is not already installed and resolve the version."
+inputs:
+  node_version:
+    description: "Node version to use"
+    required: true
+outputs:
+  version:
+    description: "Resolved Node.js version"
+    value: ${{ steps.resolved-node.outputs.version }}
+runs:
+  using: "composite"
+  steps:
+    - name: Check if Node is installed
+      id: check-node
+      shell: bash
+      run: |
+        if command -v node >/dev/null 2>&1; then
+          echo "installed=true" >> "$GITHUB_OUTPUT"
+        else
+          echo "installed=false" >> "$GITHUB_OUTPUT"
+        fi
+    - name: Setup Node.js
+      if: steps.check-node.outputs.installed == 'false'
+      uses: actions/setup-node@v3
+      with:
+        node-version: "${{ inputs.node_version }}"
+    - name: Resolve actual Node version
+      id: resolved-node
+      shell: bash
+      run: echo "version=$(node -v | sed 's/^v//')" >> "$GITHUB_OUTPUT"

.github/actions/setup-solana-anchor/action.yml

@@ -10,6 +10,10 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: "Use Node ${{ inputs.node_version }}"
+      uses: ./.github/actions/setup-node-if-needed
+      with:
+        node_version: ${{ inputs.node_version }}
     - name: Extract Solana versions
       uses: solana-developers/github-actions/[email protected]
       id: versions
@@ -19,4 +23,3 @@ runs:
         anchor_version: ${{ steps.versions.outputs.anchor_version }}
         solana_version: ${{ steps.versions.outputs.solana_version }}
         verify_version: ${{ inputs.verify_version }}
-        node_version: ${{ inputs.node_version }}