Calculate fallback key

Author: VeckoTheGecko

.github/workflows/test.yml

@@ -18,7 +18,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       cache-key: ${{ steps.create-and-cache.outputs.cache-key }}
-      fallback-key: ${{ steps.create-and-cache.outputs.fallback-key }}
       pixi-version: ${{ steps.create-and-cache.outputs.pixi-version }}
     steps:
       - name: Checkout repository
@@ -67,7 +66,6 @@ jobs:
         uses: ./pixi-lock/restore
         with:
           cache-key: ${{ needs.cache-pixi-lock.outputs.cache-key }}
-          fallback-key: ${{ needs.cache-pixi-lock.outputs.fallback-key }}
 
       - name: Verify pixi.lock exists
         shell: bash

README.md

@@ -19,7 +19,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       cache-key: ${{ steps.pixi-lock.outputs.cache-key }}
-      fallback-key: ${{ steps.pixi-lock.outputs.fallback-key }}
       pixi-version: ${{ steps.pixi-lock.outputs.pixi-version }}
     steps:
       - uses: actions/checkout@v4
@@ -39,7 +38,6 @@ jobs:
       - uses: Parcels-code/pixi-lock/restore@v1
         with:
           cache-key: ${{ needs.cache-pixi-lock.outputs.cache-key }}
-          fallback-key: ${{ needs.cache-pixi-lock.outputs.fallback-key }}
       - uses: prefix-dev/setup-pixi@v0.9.3
         with:
           pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }}
@@ -58,18 +56,16 @@ jobs:
 |--------|-------------|
 | `pixi-version` | The pixi version used |
 | `cache-key` | The cache key (includes today's date) |
-| `fallback-key` | The fallback cache key (yesterday's date) |
 
 #### `restore`
 
 | Input | Description | Required |
 |-------|-------------|----------|
 | `cache-key` | The cache key from `create-and-cache` | Yes |
-| `fallback-key` | The fallback cache key from `create-and-cache` | Yes |
 
 > [!NOTE]
 > The cache key includes the current date, so the lock file is regenerated daily.
-> The fallback key handles edge cases where the restore job runs just after midnight.
+> The fallback key (yesterday's date) is calculated automatically to handle edge cases where the restore job runs just after midnight.
 
 ## Why not commit the lock file?
 

create-and-cache/action.yml

@@ -14,9 +14,6 @@ outputs:
   cache-key:
     description: "The cache key used"
     value: ${{ steps.cache-key.outputs.key }}
-  fallback-key:
-    description: "The fallback cache key (yesterday's date)"
-    value: ${{ steps.cache-key.outputs.fallback-key }}
 
 runs:
   using: "composite"
@@ -26,10 +23,8 @@ runs:
       shell: bash
       run: |
         today=$(date +'%Y-%m-%d')
-        yesterday=$(date -d 'yesterday' +'%Y-%m-%d' 2>/dev/null || date -v-1d +'%Y-%m-%d')
-        base="pixi-lock_${{ inputs.pixi-version }}_${{ hashFiles('pixi.toml') }}"
-        echo "key=${base}_${today}" >> "$GITHUB_OUTPUT"
-        echo "fallback-key=${base}_${yesterday}" >> "$GITHUB_OUTPUT"
+        key="pixi-lock_${{ inputs.pixi-version }}_${{ hashFiles('pixi.toml') }}_${today}"
+        echo "key=${key}" >> "$GITHUB_OUTPUT"
 
     - name: Restore pixi.lock from cache
       uses: actions/cache/restore@v5

restore/action.yml

@@ -5,19 +5,28 @@ inputs:
   cache-key:
     description: "The cache key from create-and-cache"
     required: true
-  fallback-key:
-    description: "The fallback cache key from create-and-cache (for midnight edge cases)"
-    required: true
 
 runs:
   using: "composite"
   steps:
+    - name: Calculate fallback key
+      id: fallback
+      shell: bash
+      run: |
+        cache_key="${{ inputs.cache-key }}"
+        # Extract base (everything before the last _) and date (after the last _)
+        base="${cache_key%_*}"
+        current_date="${cache_key##*_}"
+        # Calculate yesterday's date
+        yesterday=$(date -d "${current_date} - 1 day" +'%Y-%m-%d' 2>/dev/null || date -j -f '%Y-%m-%d' -v-1d "${current_date}" +'%Y-%m-%d')
+        echo "key=${base}_${yesterday}" >> "$GITHUB_OUTPUT"
+
     - name: Restore pixi.lock from cache
       uses: actions/cache/restore@v5
       id: restore
       with:
         path: pixi.lock
         key: ${{ inputs.cache-key }}
         restore-keys: |
-          ${{ inputs.fallback-key }}
+          ${{ steps.fallback.outputs.key }}
         fail-on-cache-miss: true