From 5f096cab2dc45041d7d42dc986c7de346e22bf06 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 17 Feb 2024 20:10:45 +0900 Subject: [PATCH 1/2] Updated building images workflow --- .github/workflows/images_build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index a18538d04..84a269205 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -337,11 +337,13 @@ jobs: echo "${cache_to[*]}" echo "::endgroup::" - cache_from=$(printf '%s\n' "${cache_from[@]}" | jq -R . | jq -s --compact-output .) - cache_to=$(printf '%s\n' "${cache_to[@]}" | jq -R . | jq -s --compact-output .) + cache_from=$(printf '"%s",' "${cache_from[@]}") + cache_from="${cache_from%,}" + cache_to=$(printf '"%s",' "${cache_to[@]}") + cache_to="${cache_to%,}" - echo "cache_from=\"$cache_from\"" >> $GITHUB_OUTPUT - echo "cache_to=\"$cache_to\"" >> $GITHUB_OUTPUT + echo "cache_from=$cache_from" >> $GITHUB_OUTPUT + echo "cache_to=$cache_to" >> $GITHUB_OUTPUT - name: Build and publish image id: docker_build From 1303e11230b2c4384856c4a93b948528ad602d76 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sat, 17 Feb 2024 20:12:22 +0900 Subject: [PATCH 2/2] Updated building images workflow --- .github/workflows/images_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml index 84a269205..0cd11203d 100644 --- a/.github/workflows/images_build.yml +++ b/.github/workflows/images_build.yml @@ -357,8 +357,8 @@ jobs: labels: | org.opencontainers.image.revision=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} org.opencontainers.image.created=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }} - cache-from: ${{ toJSON(steps.cache_data.outputs.cache_from) }} - cache-to: ${{ toJSON(steps.cache_data.outputs.cache_to) }} + cache-from: ${{ steps.cache_data.outputs.cache_from }} + cache-to: ${{ steps.cache_data.outputs.cache_to }} - name: Sign the images with GitHub OIDC Token if: ${{ env.AUTO_PUSH_IMAGES }}