Update haskell caching for ci and release workflows

adl-lang · Apr 24, 2023 · 7c69905 · 7c69905
1 parent 632701a
commit 7c69905
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,13 +21,21 @@ jobs:
       - name: Clone project
         uses: actions/checkout@v2
 
-      - name: Cache dependencies
-        uses: actions/cache@v1
+      - name: Cache ~/.stack
+        uses: actions/cache@v3
         with:
           path: ~/.stack
-          key: ${{ runner.os }}-${{ hashFiles('haskell/stack.yaml') }}
+          key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-
+            ${{ runner.os }}-stack-global-
+
+      - name: Cache .stack-work
+        uses: actions/cache@v3
+        with:
+          path: haskell/.stack-work
+          key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}-${{ hashFiles('**/*.hs') }}
+          restore-keys: |
+            ${{ runner.os }}-stack-work-
 
       - name: Build and run tests
         run: "cd haskell; stack build --fast adl-compiler; stack test --fast --no-terminal adl-compiler"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
       - name: Setup Stack
@@ -27,13 +27,21 @@ jobs:
       - run: |
           git fetch --prune --unshallow
 
-      - name: Cache dependencies
-        uses: actions/cache@v1
+      - name: Cache ~/.stack
+        uses: actions/cache@v3
         with:
           path: ~/.stack
-          key: ${{ runner.os }}-2-${{ hashFiles('haskell/stack.yaml') }}
+          key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-2
+            ${{ runner.os }}-stack-global-
+
+      - name: Cache .stack-work
+        uses: actions/cache@v3
+        with:
+          path: haskell/.stack-work
+          key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}-${{ hashFiles('**/*.hs') }}
+          restore-keys: |
+            ${{ runner.os }}-stack-work-
 
       - name: Build compiler and generate zip
         run: "cd haskell; stack build adl-compiler; ./tools/make-dist.hs"