unique caches per action

sshilko · Jan 2, 2024 · e03255c · e03255c
1 parent 6055523
commit e03255c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/php-docker.yml b/.github/workflows/php-docker.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Set build date for cache expiry
         id: date
-        run: echo "::set-output name=date::$(date +'%Y.%m')"
+        run: echo "$(date +'%Y.%m'); php81" | md5 >> >> "$GITHUB_OUTPUT"
 
       - name: Cache Docker php-image
         id: docker-php-image-cache

diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -47,7 +47,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+          key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
       - name: PHP Version
         run: php --version

diff --git a/.github/workflows/phpdoc.yml b/.github/workflows/phpdoc.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Set build date for cache expiry
       id: date
-      run: echo "::set-output name=date::$(date +'%Y.%m')"
+      run: echo "$(date +'%Y.%m'); php81" | md5 >> >> "$GITHUB_OUTPUT"
 
     - name: Load cached app docker image
       id: docker-php-image-cache
@@ -57,7 +57,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: Docker install dependencies
       run: docker-compose exec -T app.php81 composer install

diff --git a/.github/workflows/phpmd.yml b/.github/workflows/phpmd.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+          key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
       - name: PHP Version
         run: php --version

diff --git a/.github/workflows/phppdepend.yml b/.github/workflows/phppdepend.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Set build date for cache expiry
       id: date
-      run: echo "::set-output name=date::$(date +'%Y.%m')"
+      run: echo "$(date +'%Y.%m'); php81" | md5 >> >> "$GITHUB_OUTPUT"
 
     - name: Load cached app docker image
       id: docker-php-image-cache
@@ -59,7 +59,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: Docker install dependencies
       run: docker-compose exec -T app.php81 composer install

diff --git a/.github/workflows/phpphan.yml b/.github/workflows/phpphan.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+          key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
       - name: PHP Version
         run: php --version

diff --git a/.github/workflows/phppsalm.yml b/.github/workflows/phppsalm.yml
@@ -42,7 +42,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: PHP Version
       run: php --version

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -47,7 +47,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+          key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
       - name: PHP Version
         run: php --version

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -29,7 +29,7 @@ jobs:
 
     - name: Set build date for cache expiry
       id: date
-      run: echo "::set-output name=date::$(date +'%Y.%m')"
+      run: echo "$(date +'%Y.%m'); php81" | md5 >> >> "$GITHUB_OUTPUT"
 
     - name: Load cached app docker image
       id: docker-php-image-cache
@@ -62,7 +62,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: Docker install dependencies
       run: docker-compose exec -T app.php81 composer install

diff --git a/.github/workflows/phpunit80.yml b/.github/workflows/phpunit80.yml
@@ -69,7 +69,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: /tmp/docker-save
-        key: ${{ runner.os }}-docker-php-xbuild80-save-${{ hashFiles('build/Dockerfile.php.common', 'build/Dockerfile.php80') }}
+        key: ${{ runner.os }}-docker-php-build80-save-${{ hashFiles('build/Dockerfile.php.common', 'build/Dockerfile.php80', 'composer.lock') }}
     - name: Load cached Docker image
       run: docker load -i /tmp/docker-save/snapshot.tar && docker tag app/php-image-cache app/php80
 
@@ -94,7 +94,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php80-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: Docker install dependencies
       run: docker-compose exec -T app.php80 composer install

diff --git a/.github/workflows/phpunit81.yml b/.github/workflows/phpunit81.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/docker-save
-          key: ${{ runner.os }}-docker-php-xbuild81-save-${{ hashFiles('build/Dockerfile.php.common', 'build/Dockerfile.php81') }}
+          key: ${{ runner.os }}-docker-php-xbuild81-save-${{ hashFiles('build/Dockerfile.php.common', 'build/Dockerfile.php81', 'composer.lock') }}
 
       - name: Load cached Docker image
         run: docker load -i /tmp/docker-save/snapshot.tar || true
@@ -92,7 +92,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php81-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: Docker install dependencies
       run: docker-compose exec -T app.php81 composer install

diff --git a/.github/workflows/phpunit82.yml b/.github/workflows/phpunit82.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/docker-save
-          key: ${{ runner.os }}-docker-php82-xbuild-save-${{ hashFiles('build/Dockerfile.php.common', 'build/Dockerfile.php82') }}
+          key: ${{ runner.os }}-docker-php82-xbuild-save-${{ hashFiles('build/Dockerfile.php.common', 'build/Dockerfile.php82', 'composer.lock') }}
 
       - name: Load cached Docker image
         run: docker load -i /tmp/docker-save/snapshot.tar || true
@@ -92,7 +92,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('/composer.lock') }}-composer-dev
+        key: ${{ runner.os }}-php82-${{ hashFiles('composer.lock') }}-composer-dev
 
     - name: Docker install dependencies
       run: docker-compose exec -T app.php82 composer install