compress before installing, rebase

acts-project · Dec 19, 2024 · 04c4235 · 04c4235
1 parent b9f4c64
commit 04c4235
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml
@@ -35,6 +35,19 @@ runs:
         zstd -d spack.tar.zst -o spack.tar
         tar xf spack.tar
         rm spack.tar
+        git -C spack pull --rebase
+
+    - name: Compress spack directory for caching if we cloned
+      if: steps.cache-spack-restore.outputs.cache-hit == 'false'
+      shell: bash
+      run: |
+        tar cf spack.tar spack/
+        zstd -T0 -10 spack.tar -o spack.tar.zst
+
+    - uses: actions/cache/save@v4
+      with:
+        path: spack.tar.zst
+        key: ${{ env.CACHE_KEY }}-spack
 
     - name: Install dependencies
       shell: bash
@@ -49,16 +62,3 @@ runs:
           echo "Without compiler"
           CI/dependencies/setup.sh
         fi
-
-    - name: Compress spack directory for caching
-      shell: bash
-      run: |
-        # Compress spack directory for caching
-        echo "Compressing spack directory..."
-        tar cf spack.tar spack/
-        zstd -T0 -10 spack.tar -o spack.tar.zst
-
-    - uses: actions/cache/save@v4
-      with:
-        path: spack.tar.zst
-        key: ${{ env.CACHE_KEY }}-spack