CI: further improve caching

ctrueden · ctrueden · commit e02ec7ec7147 · 2026-05-23T08:42:38.000-05:00
diff --git a/.github/delete-cache.sh b/.github/delete-cache.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+test "$1" || { echo "Usage: delete-cache.sh cache-key"; exit 1; }
+gh api --method DELETE \
+  -H "Accept: application/vnd.github+json" \
+  "/repos/scijava/pom-scijava/actions/caches?key=$1" || true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,18 +55,16 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cache/pombast
-          key: ${{ runner.os }}-pombast-cache
+          key: ${{ runner.os }}-pombast-build
 
       - name: Run pombast melt+smelt commands
         run: .github/melt.sh
         shell: bash
 
       - name: Delete old pombast cache
         if: always()
-        run: |
-          gh api --method DELETE \
-            -H "Accept: application/vnd.github+json" \
-            "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-pombast-cache" || true
+        run: .github/delete-cache.sh "${{ runner.os }}-pombast-build"
+        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -75,7 +73,7 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: ~/.cache/pombast
-          key: ${{ runner.os }}-pombast-cache
+          key: ${{ runner.os }}-pombast-build
 
       - name: Publish smelt results
         if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push'
diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml
@@ -28,8 +28,8 @@ jobs:
         with:
           path: ~/.cache/pombast
           key: ${{ runner.os }}-pombast-status
-          restore-keys: ${{ runner.os }}-pombast-cache
 
+      # The monoqueue library is used by pombast to read GitHub issues.
       - name: Restore monoqueue cache
         uses: actions/cache/restore@v4
         with:
@@ -44,10 +44,8 @@ jobs:
 
       - name: Delete old pombast status cache
         if: always()
-        run: |
-          gh api --method DELETE \
-            -H "Accept: application/vnd.github+json" \
-            "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-pombast-status" || true
+        run: .github/delete-cache.sh "${{ runner.os }}-pombast-status"
+        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -60,10 +58,8 @@ jobs:
 
       - name: Delete old monoqueue cache
         if: always()
-        run: |
-          gh api --method DELETE \
-            -H "Accept: application/vnd.github+json" \
-            "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-monoqueue-status" || true
+        run: .github/delete-cache.sh "${{ runner.os }}-monoqueue-status"
+        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
