From 3eb364a6cc5b76bfcd9d9cf840345d6f2b8875a3 Mon Sep 17 00:00:00 2001 From: "balena-renovate[bot]" <133977723+balena-renovate[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 04:56:43 +0000 Subject: [PATCH 1/2] Update dependency docker/buildx to v0.20.1 Update docker/buildx from 0.20.0 to 0.20.1 Change-type: patch --- .github/workflows/flowzone.yml | 6 +++--- flowzone.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index ba8d20fe6..104bb21dc 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -1347,7 +1347,7 @@ jobs: id: setup_buildx uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 env: - BUILDX_VERSION: v0.20.0 + BUILDX_VERSION: v0.20.1 with: version: v0.9.1 - name: Pre-process Docker bake files @@ -2512,7 +2512,7 @@ jobs: id: setup_buildx uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 env: - BUILDX_VERSION: v0.20.0 + BUILDX_VERSION: v0.20.1 with: driver-opts: network=host install: true @@ -2801,7 +2801,7 @@ jobs: id: setup_buildx uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 env: - BUILDX_VERSION: v0.20.0 + BUILDX_VERSION: v0.20.1 with: driver-opts: network=host install: true diff --git a/flowzone.yml b/flowzone.yml index 50b8869a0..19aaa60db 100644 --- a/flowzone.yml +++ b/flowzone.yml @@ -600,7 +600,7 @@ uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0 env: # renovate: datasource=github-releases depName=docker/buildx - BUILDX_VERSION: v0.20.0 + BUILDX_VERSION: v0.20.1 with: driver-opts: network=host install: true From 593c351340060be38594dc1514f3f3e99781d0ba Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Mon, 3 Feb 2025 13:33:33 -0500 Subject: [PATCH 2/2] Avoid empty set cache args passed to docker bake buildx v0.20.1 and above does not handle the empty --set *.cache-to= args Change-type: patch Signed-off-by: Kyle Harding --- .github/workflows/flowzone.yml | 9 +-------- flowzone.yml | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index 104bb21dc..54db75ba6 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -2660,14 +2660,7 @@ jobs: *.platform=${{ matrix.platform }} *.cache-to=type=gha,mode=max,scope=${{ matrix.target }}-${{ matrix.platform }} *.cache-from=type=gha,scope=${{ matrix.target }}-${{ matrix.platform }} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[0] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[1] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[2] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[3] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[4] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[5] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[6] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[7] || ''}} + *.cache-from=${{join(fromJSON(steps.cache_meta.outputs.json || '{}').tags || fromJSON('[]'),',')}} load: true provenance: false - name: Save image to file diff --git a/flowzone.yml b/flowzone.yml index 19aaa60db..ba208df2f 100644 --- a/flowzone.yml +++ b/flowzone.yml @@ -3208,14 +3208,7 @@ jobs: *.platform=${{ matrix.platform }} *.cache-to=type=gha,mode=max,scope=${{ matrix.target }}-${{ matrix.platform }} *.cache-from=type=gha,scope=${{ matrix.target }}-${{ matrix.platform }} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[0] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[1] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[2] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[3] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[4] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[5] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[6] || ''}} - *.cache-from=${{fromJSON(steps.cache_meta.outputs.json || '{}').tags[7] || ''}} + *.cache-from=${{join(fromJSON(steps.cache_meta.outputs.json || '{}').tags || fromJSON('[]'),',')}} load: true provenance: false