ci: scope apt cache keys by job and runner arch (review feedback)

test_go and test_templates install different GTK4 package sets but
shared a key slug, so whichever job saved first left the other
permanently re-downloading its extras; and the cross-compile matrix
pins per-leg runners, so arch-mismatched archives could be restored.
Keys and restore prefixes now include github.job and runner.arch.

Author: leaanthony

.github/workflows/build-and-test-v3.yml

@@ -113,9 +113,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-linux-dependencies-gtk4-default--${{ github.run_id }}
+          key: apt-install-linux-dependencies-gtk4-default--${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-linux-dependencies-gtk4-default--
+            apt-install-linux-dependencies-gtk4-default--${{ github.job }}-${{ runner.arch }}-
 
       - name: Install linux dependencies (GTK4 default)
         if: matrix.os == 'ubuntu-latest'
@@ -237,9 +237,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-linux-dependencies-gtk4-default--${{ github.run_id }}
+          key: apt-install-linux-dependencies-gtk4-default--${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-linux-dependencies-gtk4-default--
+            apt-install-linux-dependencies-gtk4-default--${{ github.job }}-${{ runner.arch }}-
 
       - name: Install linux dependencies (GTK4 default)
         if: matrix.os == 'ubuntu-latest'

.github/workflows/build-and-test.yml

@@ -29,9 +29,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-apt-packages-ubuntu-22-04-libgtk-${{ github.run_id }}
+          key: apt-install-apt-packages-ubuntu-22-04-libgtk-${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-apt-packages-ubuntu-22-04-libgtk-
+            apt-install-apt-packages-ubuntu-22-04-libgtk-${{ github.job }}-${{ runner.arch }}-
 
       - name: Install apt packages (ubuntu-22.04)
         if: matrix.os == 'ubuntu-22.04'
@@ -46,9 +46,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-apt-packages-ubuntu-24-04-libgtk-${{ github.run_id }}
+          key: apt-install-apt-packages-ubuntu-24-04-libgtk-${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-apt-packages-ubuntu-24-04-libgtk-
+            apt-install-apt-packages-ubuntu-24-04-libgtk-${{ github.job }}-${{ runner.arch }}-
 
       - name: Install apt packages (ubuntu-24.04)
         if: matrix.os == 'ubuntu-24.04'
@@ -154,9 +154,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-apt-packages-ubuntu-22-04-libgtk-${{ github.run_id }}
+          key: apt-install-apt-packages-ubuntu-22-04-libgtk-${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-apt-packages-ubuntu-22-04-libgtk-
+            apt-install-apt-packages-ubuntu-22-04-libgtk-${{ github.job }}-${{ runner.arch }}-
 
       - name: Install apt packages (ubuntu-22.04)
         if: matrix.os == 'ubuntu-22.04'
@@ -175,9 +175,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-apt-packages-ubuntu-24-04-libgtk-${{ github.run_id }}
+          key: apt-install-apt-packages-ubuntu-24-04-libgtk-${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-apt-packages-ubuntu-24-04-libgtk-
+            apt-install-apt-packages-ubuntu-24-04-libgtk-${{ github.job }}-${{ runner.arch }}-
 
       - name: Install apt packages (ubuntu-24.04)
         if: matrix.os == 'ubuntu-24.04'

.github/workflows/cross-compile-test-v3.yml

@@ -95,9 +95,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-cross-compile-${{ github.run_id }}
+          key: apt-cross-compile-${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-cross-compile-
+            apt-cross-compile-${{ github.job }}-${{ runner.arch }}-
 
       - name: Install Linux dependencies
         run: |

.github/workflows/pr-master.yml

@@ -70,9 +70,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-linux-dependencies-22-04-libgtk--${{ github.run_id }}
+          key: apt-install-linux-dependencies-22-04-libgtk--${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-linux-dependencies-22-04-libgtk--
+            apt-install-linux-dependencies-22-04-libgtk--${{ github.job }}-${{ runner.arch }}-
 
       - name: Install linux dependencies (22.04)
         if: matrix.os == 'ubuntu-22.04'
@@ -87,9 +87,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.apt-archives
-          key: apt-install-linux-dependencies-24-04-libgtk--${{ github.run_id }}
+          key: apt-install-linux-dependencies-24-04-libgtk--${{ github.job }}-${{ runner.arch }}-${{ github.run_id }}
           restore-keys: |
-            apt-install-linux-dependencies-24-04-libgtk--
+            apt-install-linux-dependencies-24-04-libgtk--${{ github.job }}-${{ runner.arch }}-
 
       - name: Install linux dependencies (24.04)
         if: matrix.os == 'ubuntu-24.04'