Fixup cache key for GA: prefer matrix.os

Change-Id: I43684ca1900c41934a244e2be810f7358419d07e

Author: Synss

.github/workflows/pr.yaml

@@ -12,14 +12,15 @@ on: [push, pull_request]
 
 jobs:
     testing:
-        runs-on: ubuntu-24.04
+        runs-on: ${{ matrix.os }}
         env:
             PYTHONWARNINGS: ignore:DeprecationWarning
             # Avoid falling back to our internal bazel remote cache on github actions
             BAZEL_CACHE_URL: ""
             # Needed by "make .venv" to compute PYTHON_REQUIREMENTS_TEST
             EDITION: community
         strategy:
+            os: [ubuntu-24.04]
             matrix:
                 include:
                     - name: Bandit tests
@@ -68,7 +69,7 @@ jobs:
             - name: Cache uv
               uses: actions/cache@v3
               with:
-                  key: uv-$ImageOS-${{ hashFiles('requirements_all_lock.txt') }}
+                  key: uv-${{ matrix.os }}-${{ hashFiles('requirements_all_lock.txt') }}
                   path: ${{ env.UV_CACHE_DIR  }}
             - name: Cache bazelisk
               uses: actions/cache@v3
@@ -79,11 +80,11 @@ jobs:
             - name: Cache bazel
               uses: actions/cache@v3
               with:
-                  key: $ImageOS-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE', 'MODULE.bazel') }}
+                  key: ${{ matrix.os }}-bazel-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE', 'MODULE.bazel') }}
                   path: |
                       ~/.cache/bazel
                   restore-keys: |
-                      $ImageOS-bazel-
+                      ${{ matrix.os }}-bazel-
             - name: Setup Environment
               run: |
                   # ksh: Needed for some "unit test" (test_mk_errpt_aix).