Fix incorrect cache paths.

Author: Potherca

.github/workflows/solid-tests-suites.yml

@@ -106,37 +106,36 @@ jobs:
           docker image save solid-nextcloud:${{ env.TAG }} \
             --output ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar
 
-
   pull-docker-cookie:
     needs: docker-images
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v4
         id: cache-docker-cookie
         with:
-          path: cache/
+          path: cache/cookie
           key: ${{ needs.docker-images.outputs.COOKIE_KEY }}
       - if: steps.cache-docker-cookie.outputs.cache-hit != 'true'
         run: |
-          mkdir -p cache/
+          mkdir -p cache/cookie/
           docker pull ${{ needs.docker-images.outputs.COOKIE_IMAGE }}
           docker image save ${{ needs.docker-images.outputs.COOKIE_IMAGE }} \
-            --output ./cache/${{ needs.docker-images.outputs.COOKIE_KEY }}.tar
+            --output ./cache/cookie/${{ needs.docker-images.outputs.COOKIE_KEY }}.tar
   pull-docker-pubsub:
     needs: docker-images
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v4
         id: cache-docker-pubsub
         with:
-          path: cache/
+          path: cache/pubsub
           key: ${{ needs.docker-images.outputs.PUBSUB_KEY }}
       - if: steps.cache-docker-pubsub.outputs.cache-hit != 'true'
         run: |
-          mkdir -p cache/
+          mkdir -p cache/pubsub/
           docker pull ${{ needs.docker-images.outputs.PUBSUB_IMAGE }}
           docker image save ${{ needs.docker-images.outputs.PUBSUB_IMAGE }} \
-            --output ./cache/${{ needs.docker-images.outputs.PUBSUB_KEY }}.tar
+            --output ./cache/pubsub/${{ needs.docker-images.outputs.PUBSUB_KEY }}.tar
 
   pull-docker-solid-crud-tests:
     needs: docker-images
@@ -145,44 +144,44 @@ jobs:
       - uses: actions/cache@v4
         id: cache-docker-solid-crud-tests
         with:
-          path: cache/
+          path: cache/tests/solidtestsuite/
           key: ${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_KEY }}
       - if: steps.cache-docker-solid-crud-tests.outputs.cache-hit != 'true'
         run: |
-          mkdir -p cache/
+          mkdir -p cache/tests/solidtestsuite/
           docker pull ${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_IMAGE }}
           docker image save ${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_IMAGE }} \
-            --output ./cache/${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_KEY }}.tar
+            --output ./cache/tests/solidtestsuite/${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_KEY }}.tar
   pull-docker-web-access-control-tests:
     needs: docker-images
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v4
         id: cache-docker-web-access-control-tests
         with:
-          path: cache/
+          path: cache/tests/solidtestsuite/
           key: ${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}
       - if: steps.cache-docker-web-access-control-tests.outputs.cache-hit != 'true'
         run: |
-          mkdir -p cache/
+          mkdir -p cache/tests/solidtestsuite/
           docker pull ${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_IMAGE }}
           docker image save ${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_IMAGE }} \
-            --output ./cache/${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}.tar
+            --output ./cache/tests/solidtestsuite/${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}.tar
   pull-docker-webid-provider-tests:
     needs: docker-images
     runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v4
         id: cache-docker-webid-provider-tests
         with:
-          path: cache/
+          path: cache/tests/solidtestsuite/
           key: ${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_KEY }}
       - if: steps.cache-docker-webid-provider-tests.outputs.cache-hit != 'true'
         run: |
-          mkdir -p cache/
+          mkdir -p cache/tests/solidtestsuite/
           docker pull ${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_IMAGE }}
           docker image save ${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_IMAGE }} \
-            --output ./cache/${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_KEY }}.tar
+            --output ./cache/tests/solidtestsuite/${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_KEY }}.tar
 
   solid-testsuite:
     timeout-minutes: 30
@@ -226,6 +225,21 @@ jobs:
         with:
           path: cache/solid-nextcloud
           key: solid-nextcloud-docker-${{ matrix.nextcloud_version }}-${{ github.sha }}
+      - uses: actions/cache@v4
+        id: cache-docker-cookie
+        with: {path: cache/cookie, key: "${{ needs.docker-images.outputs.COOKIE_KEY }}"}
+      - uses: actions/cache@v4
+        id: cache-docker-pubsub
+        with: {path: cache/pubsub, key: "${{ needs.docker-images.outputs.PUBSUB_KEY }}"}
+      - uses: actions/cache@v4
+        id: cache-docker-solid-crud-tests
+        with: {path: cache/tests, key: "${{ needs.docker-images.outputs.SOLID_CRUD_TESTS_KEY }}"}
+      - uses: actions/cache@v4
+        id: cache-docker-web-access-control-tests
+        with: {path: cache/tests, key: "${{ needs.docker-images.outputs.WEB_ACCESS_CONTROL_TESTS_KEY }}"}
+      - uses: actions/cache@v4
+        id: cache-docker-webid-provider-tests
+        with: {path: cache/tests, key: "${{ needs.docker-images.outputs.WEBID_PROVIDER_TESTS_KEY }}"}
 
       - uses: docker/login-action@v3
         with:
@@ -237,9 +251,9 @@ jobs:
       - name: Load docker Images
         run: |
           docker image load --input ./cache/solid-nextcloud/${{ github.sha }}-${{ matrix.nextcloud_version }}.tar
-          docker image load --input ./cache/${{ needs.docker-images.outputs.COOKIE_KEY }}.tar
-          docker image load --input ./cache/${{ matrix.test }}.tar
-          docker image load --input ./cache/${{ needs.docker-images.outputs.PUBSUB_KEY }}.tar
+          docker image load --input ./cache/cookie/${{ needs.docker-images.outputs.COOKIE_KEY }}.tar
+          docker image load --input ./cache/tests/${{ matrix.test }}.tar
+          docker image load --input ./cache/pubsub/${{ needs.docker-images.outputs.PUBSUB_KEY }}.tar
 
       - name: Start Docker Containers
         run: |