ci: fix build cache path

.gitea/workflows/gentoo-utils.yml

@@ -16,7 +16,7 @@ jobs:
     continue-on-error: true
     steps:
       - name: Restore git cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: .git
           key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
@@ -91,21 +91,12 @@ jobs:
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-      - name: Restore Git Cache
-        uses: actions/cache@v5
-        with:
-          path: .git
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
-
       - name: Checkout repo
         uses: actions/checkout@v6
 
-      - name: Build
+        # TODO: This is currently unused by other jobs. I couldn't make meson not regenerate things regardless of
-        run: |
+        # the build dir already existing.
-          meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
+      - name: Build Cache Setup
-          meson compile -C build
-
-      - name: Cache Build + Subprojects
         uses: actions/cache@v5
         with:
           path: |
@@ -113,6 +104,12 @@ jobs:
             build
           key: build-${{ gitea.repository }}-${{ gitea.sha }}
 
+      - name: Build
+        run: |
+          meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
+          meson compile -C build
+
+
   # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
   # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
   test:
@@ -120,28 +117,13 @@ jobs:
     env:
       CC: "clang"
       CXX: "clang++"
-    needs: [build-oci-image, build]
+    needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-
-      - name: Restore git cache
-        uses: actions/cache@v5
-        with:
-          path: .git
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
-
       - name: Checkout repo
         uses: actions/checkout@v6
 
-      - name: Restore build cache
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            subprojects
-            build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
-
       - name: test
         run: |
           meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
@@ -154,26 +136,13 @@ jobs:
       CC: "clang"
       CXX: "clang++"
       FUZZER_TIMEOUT_S: 300
-    needs: [build-oci-image, build]
+    needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-      - name: Restore Git Cache
-        uses: actions/cache@v5
-        with:
-          path: .git
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
-
       - name: Checkout repo
         uses: actions/checkout@v6
 
-      - name: Restore Build Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            subprojects
-            build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
       # FIXME: Get rid of this step when portage has fixes merged?
       # needed because portage has fixes upstream we need that arent stable yet
       - name: Checkout tip of portage
@@ -195,27 +164,13 @@ jobs:
 
   check-format:
     runs-on: gentoo
-    needs: [build-oci-image, build]
+    needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-      - name: Restore Git Cache
-        uses: actions/cache@v5
-        with:
-          path: .git
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
-
       - name: Checkout repo
         uses: actions/checkout@v6
 
-      - name: Restore Build Cache
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            subprojects
-            build
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.sha }}
-
       - name: Check Formatting
         run: |
           meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized build
@@ -224,16 +179,10 @@ jobs:
 
   docs:
     runs-on: gentoo
-    needs: [build-oci-image, build]
+    needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
     steps:
-      - name: Restore Git Cache
-        uses: actions/cache@v5
-        with:
-          path: .git
-          key: gitea-repo-${{ gitea.repository }}-${{ gitea.ref }}
-
       - name: Checkout repo
         uses: actions/checkout@v6