From e12b20b8a35dbec6d0f018895a71b877c6d2e8a4 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Sun, 28 Jan 2024 09:20:25 +0100 Subject: [PATCH] Fixup cache again --- .github/cache/act/actions/.gitkeep | 0 .github/cache/act/artifacts/.gitkeep | 0 .github/cache/act/cache/.gitkeep | 0 .github/cache/docker/.gitkeep | 0 .github/workflows/bouncer.yml | 4 ++-- .github/workflows/laravel.yml | 4 ++-- .github/workflows/marshall.yml | 4 ++-- .github/workflows/mitm-proxy.yml | 4 ++-- .github/workflows/mysql-proxy.yml | 4 ++-- .github/workflows/php-core.yml | 4 ++-- .github/workflows/php-flavours.yml | 4 ++-- .github/workflows/redis.yml | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 .github/cache/act/actions/.gitkeep create mode 100644 .github/cache/act/artifacts/.gitkeep create mode 100644 .github/cache/act/cache/.gitkeep create mode 100644 .github/cache/docker/.gitkeep diff --git a/.github/cache/act/actions/.gitkeep b/.github/cache/act/actions/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.github/cache/act/artifacts/.gitkeep b/.github/cache/act/artifacts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.github/cache/act/cache/.gitkeep b/.github/cache/act/cache/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.github/cache/docker/.gitkeep b/.github/cache/docker/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.github/workflows/bouncer.yml b/.github/workflows/bouncer.yml index 1ea1328..66c94eb 100644 --- a/.github/workflows/bouncer.yml +++ b/.github/workflows/bouncer.yml @@ -94,5 +94,5 @@ jobs: tags: | ${{ !env.ACT && 'benzine/bouncer:latest' || '' }} ${{ !env.ACT && 'ghcr.io/benzine-framework/bouncer:latest' || 'ghcr.io/benzine-framework/bouncer:devel' }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }} diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index c9f4b45..f0ff4e1 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -53,8 +53,8 @@ jobs: PHP_VERSION=${{ matrix.version }} tags: | matthewbaggett/laravel:${{ matrix.version }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }} laravel-tag-latest: name: "Bake Laravel Container" diff --git a/.github/workflows/marshall.yml b/.github/workflows/marshall.yml index 9b31163..5de2912 100644 --- a/.github/workflows/marshall.yml +++ b/.github/workflows/marshall.yml @@ -70,5 +70,5 @@ jobs: MARSHALL_VERSION=${{ steps.environment.outputs.marshall_version }} MARSHALL_BUILD_DATE=${{ steps.environment.outputs.marshall_build_date }} MARSHALL_BUILD_HOST=${{ steps.environment.outputs.marshall_build_host }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }} diff --git a/.github/workflows/mitm-proxy.yml b/.github/workflows/mitm-proxy.yml index 6dcf570..b3fad62 100644 --- a/.github/workflows/mitm-proxy.yml +++ b/.github/workflows/mitm-proxy.yml @@ -97,7 +97,7 @@ jobs: tags: | ${{ !env.ACT && format('benzine/mitmproxy:{0}',matrix.mitmproxy) || '' }} ${{ format('ghcr.io/benzine-framework/mitmproxy:{0}', matrix.mitmproxy) }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || '' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || '' }} diff --git a/.github/workflows/mysql-proxy.yml b/.github/workflows/mysql-proxy.yml index 9e61d5d..d87aba0 100644 --- a/.github/workflows/mysql-proxy.yml +++ b/.github/workflows/mysql-proxy.yml @@ -62,5 +62,5 @@ jobs: tags: | ${{ !env.ACT && 'benzine/mysql-proxy:latest' || '' }} ${{ !env.ACT && 'ghcr.io/benzine-framework/mysql-proxy:latest' || 'ghcr.io/benzine-framework/mysql-proxy:devel' }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }} diff --git a/.github/workflows/php-core.yml b/.github/workflows/php-core.yml index 0ee9b86..2961fb2 100644 --- a/.github/workflows/php-core.yml +++ b/.github/workflows/php-core.yml @@ -105,5 +105,5 @@ jobs: benzine/php:core-${{ matrix.version }} build-args: | ${{ steps.build_args.outputs.result }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }} diff --git a/.github/workflows/php-flavours.yml b/.github/workflows/php-flavours.yml index fd599dd..b913f1f 100644 --- a/.github/workflows/php-flavours.yml +++ b/.github/workflows/php-flavours.yml @@ -96,5 +96,5 @@ jobs: benzine/php:${{ matrix.variant }}-${{ matrix.version }} build-args: | ${{ steps.build_args.outputs.result }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }} diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml index 6d8a936..e21af6e 100644 --- a/.github/workflows/redis.yml +++ b/.github/workflows/redis.yml @@ -81,7 +81,7 @@ jobs: tags: | ${{ !env.ACT && format('benzine/redis:{0}',matrix.redis) || '' }} ${{ format('ghcr.io/benzine-framework/redis:{0}', matrix.redis) }} - cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache' }} - cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache' }} + cache-from: ${{ !env.ACT && 'type=gha' || 'type=local,src=.github/cache/docker' }} + cache-to: ${{ !env.ACT && 'type=gha,mode=max' || 'type=local,dest=.github/cache/docker' }}