merge and fix conflicts

bats-core · Sep 25, 2024 · f430596 · f430596
2 parents f0f8b17 + 5932fdb
commit f430596
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/action.yaml b/action.yaml
@@ -115,7 +115,7 @@ runs:
       with:
         path: |
           ~/.local/share/bats
-        key: ${{ runner.os }}-bats-${{ inputs.bats-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-bats-${{ inputs.bats-version }}
 
     - name: "Set PATH in case of cache-hit"
       if: inputs.bats-install == 'true' && steps.bats-cache.outputs.cache-hit == 'true'
@@ -195,7 +195,7 @@ runs:
       id: support-cache
       with:
         path: ${{ env.SUPPORT_DESTDIR }}
-        key: ${{ runner.os }}-bats-support-${{ inputs.support-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-bats-support-${{ inputs.support-version }}
 
     - name: "Download and install Bats-support"
       if: inputs.support-install == 'true' && steps.support-cache.outputs.cache-hit != 'true'
@@ -236,7 +236,7 @@ runs:
       id: assert-cache
       with:
         path: ${{ env.ASSERT_DESTDIR }}
-        key: ${{ runner.os }}-bats-assert-${{ inputs.assert-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-bats-assert-${{ inputs.assert-version }}
 
     - name: "Download and install Bats-assert"
       if: inputs.assert-install == 'true' && steps.assert-cache.outputs.cache-hit != 'true'
@@ -277,7 +277,7 @@ runs:
       id: detik-cache
       with:
         path: ${{ env.DETIK_DESTDIR }}
-        key: ${{ runner.os }}-bats-detik-${{ inputs.detik-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-bats-detik-${{ inputs.detik-version }}
 
     - name: "Download and install Bats-detik"
       if: inputs.detik-install == 'true' && steps.detik-cache.outputs.cache-hit != 'true'
@@ -317,7 +317,7 @@ runs:
       id: file-cache
       with:
         path: ${{ env.FILE_DESTDIR }}
-        key: ${{ runner.os }}-bats-file-${{ inputs.file-version }}
+        key: ${{ runner.os }}-${{ runner.arch }}-bats-file-${{ inputs.file-version }}
 
     - name: "Download and install Bats-file"
       if: inputs.file-install == 'true' && steps.file-cache.outputs.cache-hit != 'true'