Merge pull request #870 from nanasess/fix-docker-build-cache

dockerbuild workflow のみキャッシュを保存し、テスト実行時はキャッシュを保存しない
EC-CUBE · Mar 23, 2024 · bce476d · bce476d
2 parents 33f507d + defc1df
commit bce476d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/actions/dockerbuild/action.yml b/.github/actions/dockerbuild/action.yml
@@ -9,6 +9,10 @@ inputs:
     description: 'Docker registry to push to'
     default: 'ghcr.io'
     required: true
+  cache-to:
+    description: 'Add the Docker build layer to the cache'
+    default: ~
+    required: false
 
 runs:
   using: "composite"
@@ -60,7 +64,7 @@ runs:
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
         cache-from: type=gha,scope=php-${{ inputs.php-version }}
-        cache-to: type=gha,mode=max,scope=php-${{ inputs.php-version }}
+        cache-to: ${{ inputs.cache-to }}
         build-args: |
           PHP_VERSION_TAG=${{ inputs.php-version }}
           GD_OPTIONS=${{ env.GD_OPTIONS }}

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -29,3 +29,4 @@ jobs:
         uses: ./.github/actions/dockerbuild
         with:
           php-version: ${{ matrix.php }}
+          cache-to: type=gha,mode=max,scope=php-${{ matrix.php }}