From 8cd8f08d77fc65c82c57214019d8533c56b6148c Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:28:51 +0200 Subject: [PATCH 1/2] escape containerimage.digest attribut in merge.yml GHA worlflow Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- .github/workflows/merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f2caa9a26..0439eb2f5 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -77,7 +77,7 @@ jobs: bin-image: runs-on: ubuntu-22.04 outputs: - tags: ${{ steps.meta.outputs.tags }} + digest: ${{ fromJSON(steps.bake.outputs.metadata).image['containerimage.digest'] }} steps: - name: Checkout @@ -145,6 +145,6 @@ jobs: workflow_id: 'compose-edge-integration.yml', ref: 'compose-edge-integration' inputs: { - "image-tag": '${{ fromJSON(needs.bin-image.bake.outputs.metadata).image-cross["containerimage.digest"] }}' + "image-tag": "${{ needs.bin-image.outputs.digest }}" } }) From 7a870e2449c334a8fcbac342ab7a7728a017ec17 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:33:30 +0200 Subject: [PATCH 2/2] Update .github/workflows/merge.yml Co-authored-by: CrazyMax Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 0439eb2f5..9a5efaf81 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -77,7 +77,7 @@ jobs: bin-image: runs-on: ubuntu-22.04 outputs: - digest: ${{ fromJSON(steps.bake.outputs.metadata).image['containerimage.digest'] }} + digest: ${{ fromJSON(steps.bake.outputs.metadata).image-cross['containerimage.digest'] }} steps: - name: Checkout