fix(composer-install): fix vendor cache clashing with composer cache

myparcelnl · Aug 2, 2023 · 9683980 · 9683980
1 parent 3ee803c
commit 9683980
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/composer-install/action.yml b/composer-install/action.yml
@@ -30,19 +30,18 @@ runs:
       uses: actions/cache@v3
       with:
         path: /tmp/composer-cache
-        key: composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
+        key: composer-${{ hashFiles('**/composer.json, **/composer.lock') }}
         restore-keys: |
-          composer-${{ hashFiles('**/composer.json') }}-
           composer-
 
     - name: 'Handle vendor folder cache'
       uses: actions/cache@v3
       with:
         path: vendor
-        key: composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
+        key: composer-vendor-${{ hashFiles('**/composer.json', '**/composer.lock') }}-${{ inputs.flags }}
         restore-keys: |
-          composer-${{ hashFiles('**/composer.json') }}-
-          composer-
+          composer-vendor-${{ hashFiles('**/composer.json', '**/composer.lock') }}-
+          composer-vendor-
 
     - uses: myparcelnl/actions/pull-docker-image@v3
       with: