Include runner arch in cache & artifact keys

Author: smheidrich

.github/workflows/build.yml

@@ -58,18 +58,18 @@ jobs:
           cache-name: cargo-home
         with:
           path: ~/cargo-home-dirs
-          key: ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.cibw-build-prefix }}-v11.0
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{ runner.arch }}-${{ matrix.cibw-build-prefix }}-v11.0
           restore-keys: |
-            ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.cibw-build-prefix }}-v11.
+            ${{ env.cache-name }}-${{ runner.os }}-${{ runner.arch }}-${{ matrix.cibw-build-prefix }}-v11.
       - name: Rust build cache
         uses: actions/cache@v4
         env:
           cache-name: rust-build
         with:
           path: ~/cargo-target-dirs
-          key: ${{ env.cache-name }}-${{ runner.os }}-v11.0-${{ matrix.cibw-build-prefix }}-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{ runner.arch }}-v11.0-${{ matrix.cibw-build-prefix }}-${{ hashFiles('**/Cargo.toml') }}
           restore-keys: |
-            ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.cibw-build-prefix }}-v11.
+            ${{ env.cache-name }}-${{ runner.os }}-${{ runner.arch }}-${{ matrix.cibw-build-prefix }}-v11.
       - name: Save env vars for cibuildwheel
         run: >
           echo "MAIN_DIR=$PWD" >> "$GITHUB_ENV";
@@ -145,7 +145,7 @@ jobs:
           CIBW_BUILD_VERBOSITY: 1
       - uses: actions/upload-artifact@v4
         with:
-          name: artifact-${{ runner.os }}-${{ matrix.cibw-build-kind }}
+          name: artifact-${{ runner.os }}-${{ runner.arch }}-${{ matrix.cibw-build-kind }}
           path: ./wheelhouse/*.whl
 
   build_sdist:

.github/workflows/test.yml

@@ -54,17 +54,17 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-rust-v4-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-rust-v4-${{ hashFiles('**/Cargo.lock') }}
       - name: 'Debug: check rustc'
         run: |
           rustc -V
       - name: Restore Python/pip cache
         uses: actions/cache/restore@v4
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-python-v3-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-python-v3-${{ hashFiles('**/requirements.txt') }}
           restore-keys: |
-           ${{ runner.os }}-python-v3-
+           ${{ runner.os }}-${{ runner.arch }}-python-v3-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -88,10 +88,10 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-rust-v4-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-rust-v4-${{ hashFiles('**/Cargo.lock') }}
       - name: Save Python/pip cache
         uses: actions/cache/save@v4
         if: always()
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-python-v3-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-python-v3-${{ hashFiles('**/requirements.txt') }}