From 53f2d72e022ad5ae7cfcf511318788fed959fe0b Mon Sep 17 00:00:00 2001 From: Dhruv Manilawala Date: Thu, 12 Dec 2024 20:29:48 +0530 Subject: [PATCH] Revert certain double quotes from workflow shell script (#14939) Follow-up from #14938 --- .github/workflows/build-docker.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index d663e7823624e..a8724a0168ee2 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -143,8 +143,8 @@ jobs: # The final command becomes `docker buildx imagetools create -t tag1 -t tag2 ... @sha256: @sha256: ...` run: | docker buildx imagetools create \ - "$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")" \ - "$(printf "${RUFF_BASE_IMG}@sha256:%s " *)" + $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf "${RUFF_BASE_IMG}@sha256:%s " *) docker-publish-extra: name: Publish additional Docker image based on ${{ matrix.image-mapping }} @@ -288,5 +288,5 @@ jobs: readarray -t lines <<< "$DOCKER_METADATA_OUTPUT_ANNOTATIONS"; annotations=(); for line in "${lines[@]}"; do annotations+=(--annotation "$line"); done docker buildx imagetools create \ "${annotations[@]}" \ - "$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")" \ - "$(printf "${RUFF_BASE_IMG}@sha256:%s " *)" + $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf "${RUFF_BASE_IMG}@sha256:%s " *) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d72c513ed6c82..8f6829676c80c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -268,9 +268,9 @@ jobs: RELEASE_COMMIT: "${{ github.sha }}" run: | # Write and read notes from a file to avoid quoting breaking things - echo "$ANNOUNCEMENT_BODY" > "$RUNNER_TEMP/notes.txt" + echo "$ANNOUNCEMENT_BODY" > $RUNNER_TEMP/notes.txt - gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" "$PRERELEASE_FLAG" --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/* + gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/* custom-notify-dependents: needs: