Save cache with hash key

.github/actions/compile-assets/action.yml

@@ -0,0 +1,51 @@
+name: Compile assets for deploy
+description: Restore a deployed asset cache, precompile, and clean
+inputs:
+  rails_env:
+    description: RAILS_ENV to set.
+    required: true
+  fail_on_missing_cache:
+    description: Whether to fail the action on a missing cache
+    required: true
+  save_cache:
+    description: Whether to save the compiled assets to a cache
+    required: false
+    default: false
+runs:
+  using: composite
+  steps:
+    - uses: ./.github/actions/setup-languages
+
+    - name: Restore asset cache
+      uses: actions/cache/restore@v4
+      with:
+        key: ${{ inputs.rails_env }}-assets
+        fail-on-cache-miss: ${{ inputs.fail_on_missing_cache }}
+        path: |
+          public/assets
+          app/assets/builds
+          app/javascript/generated
+
+    - name: Precompile assets
+      env:
+        RAILS_ENV: ${{ inputs.rails_env }}
+        SECRET_KEY_BASE_DUMMY: 1
+      shell: bash
+      run: ./bin/rake assets:precompile
+
+    - name: Clean old assets
+      env:
+        RAILS_ENV: ${{ inputs.rails_env }}
+        SECRET_KEY_BASE_DUMMY: 1
+      shell: bash
+      run: ./bin/rake assets:clean
+
+    - name: Save cache
+      if: ${{ inputs.save_cache }}
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ inputs.rails_env }}-assets-${{ hashFiles('public/assets/.manifest.json') }}
+        path: |
+          public/assets
+          app/assets/builds
+          app/javascript/generated

.github/actions/setup-project/action.yml

@@ -15,15 +15,12 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Set up Ruby & Javascript
-      uses: ./.github/actions/setup-languages
-
     - name: Precompile assets
-      env:
-        RAILS_ENV: ${{ inputs.rails_env }}
-        SECRET_KEY_BASE: not-actually-secret
-      shell: bash
-      run: bundle exec rake assets:precompile
+      uses: ./.github/actions/compile-assets
+      with:
+        rails_env: ${{ inputs.rails_env }}
+        fail_on_missing_cache: false
+        save_cache: true
 
     - name: Set up database
       env:

.github/workflows/deploy-staging.yml

@@ -20,20 +20,13 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-languages
-      - name: Asset cache
-        uses: actions/cache@v4
+
+      - name: Compile assets
+        uses: ./.github/actions/compile-assets
         with:
-          key: staging-assets-deployed
-          path: |
-            public/assets
-            app/assets/builds
-            app/javascript/generated
-      - name: Precompile assets and clean old versions
-        env:
-          RAILS_ENV: staging
-          SECRET_KEY_BASE_DUMMY: 1
-        run: ./bin/rake assets:precompile && ./bin/rake assets:clean
+          rails_env: staging
+          fail_on_missing_cache: false
+          save_cache: true
 
       - name: Terraform apply
         uses: dflook/terraform-apply@v1

.github/workflows/owasp-daily-scan.yml

@@ -31,6 +31,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Touch staging cache
+        uses: ./.github/actions/compile-assets
+        with:
+          rails_env: staging
+          fail_on_missing_cache: true
+
       - id: setup
         uses: ./.github/actions/setup-project
 

.github/workflows/terraform-staging.yml

@@ -29,21 +29,11 @@ jobs:
         with:
           path: terraform
 
-      - uses: ./.github/actions/setup-languages
-      - name: Restore asset cache
-        uses: actions/cache/restore@v4
+      - name: Compile assets
+        uses: ./.github/actions/compile-assets
         with:
-          key: staging-assets-deployed
-          fail-on-cache-miss: true
-          path: |
-            public/assets
-            app/assets/builds
-            app/javascript/generated
-      - name: Precompile assets and clean old versions
-        env:
-          RAILS_ENV: staging
-          SECRET_KEY_BASE_DUMMY: 1
-        run: ./bin/rake assets:precompile && ./bin/rake assets:clean
+          rails_env: staging
+          fail_on_missing_cache: true
 
       - name: terraform plan
         uses: dflook/terraform-plan@v1