Merge pull request #1829 from actonlang/ci-debs-cache

Fix cache dir for build-debs
actonlang · Jul 26, 2024 · 6767de5 · 6767de5
2 parents d2d605a + c004274
commit 6767de5
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -128,14 +128,14 @@ jobs:
         if: github.event_name != 'schedule'
         id: setmatrix_pr
         run: |
-          MATRIX_JSON='{\"include\":[{\"os\":\"debian\",\"version\":\"12\",\"cache\":true}]}'
+          MATRIX_JSON='{\"include\":[{\"os\":\"debian\",\"version\":\"12\",\"arch\":\"x86_64\",\"cache\":true}]}'
           echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
 
       - name: "Set Matrix for nightly run"
         if: github.event_name == 'schedule'
         id: setmatrix_cron
         run: |
-          MATRIX_JSON='{\"include\":[{\"os\":\"debian\",\"version\":\"11\",\"cache\":false},{\"os\":\"debian\",\"version\":\"12\",\"cache\":true},{\"os\":\"ubuntu\",\"version\":\"22.04\",\"cache\":false},{\"os\":\"ubuntu\",\"version\":\"24.04\",\"cache\":false}]}'
+          MATRIX_JSON='{\"include\":[{\"os\":\"debian\",\"version\":\"11\",\"arch\":\"x86_64\",\"cache\":false},{\"os\":\"debian\",\"version\":\"12\",\"arch\":\"x86_64\",\"cache\":true},{\"os\":\"ubuntu\",\"version\":\"22.04\",\"arch\":\"x86_64\",\"cache\":false},{\"os\":\"ubuntu\",\"version\":\"24.04\",\"arch\":\"x86_64\",\"cache\":false}]}'
           echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
 
       - name: "Set final matrix output"
@@ -235,8 +235,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cache/acton/
-            ~/.stack
+            ./debian/.debhelper/
           key: build-debs
       - name: "Install build prerequisites"
         run: |
@@ -429,6 +428,12 @@ jobs:
     container:
       image: debian:experimental
     steps:
+      - name: "Cache stuff"
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/acton/
+          key: test-external-projects
       - name: "Download .deb files"
         uses: actions/download-artifact@v3
         with: