Skip to content

Commit 8f300d6

Browse files
authored
Merge pull request #1157 from fluxcd/backport-1151-1156-to-release/v1.0.x
[release/v1.0.x] Manual backport of CI fixes
2 parents a40e0da + 7c84a2c commit 8f300d6

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/backport.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
uses: korthout/backport-action@bf5fdd624b35f95d5b85991a728bd5744e8c6cf2 # v1.3.1
2424
# xref: https://github.com/korthout/backport-action#inputs
2525
with:
26+
# Use token to allow workflows to be triggered for the created PR
27+
github_token: ${{ secrets.BOT_GITHUB_TOKEN }}
2628
# Match labels with a pattern `backport:<target-branch>`
2729
label_pattern: '^backport:([^ ]+)$'
2830
# A bit shorter pull-request title than the default

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
env:
108108
ARTIFACTS: "${{ steps.run-goreleaser.outputs.artifacts }}"
109109
run: |
110-
hashes=$(echo $ARTIFACTS | jq --raw-output '.[] | {name, "digest": (.extra.Digest // .extra.Checksum)} | select(.digest) | {digest} + {name} | join(" ") | sub("^sha256:";"")' | base64 -w0)
110+
hashes=$(echo -E $ARTIFACTS | jq --raw-output '.[] | {name, "digest": (.extra.Digest // .extra.Checksum)} | select(.digest) | {digest} + {name} | join(" ") | sub("^sha256:";"")' | base64 -w0)
111111
echo "hashes=$hashes" >> $GITHUB_OUTPUT
112112
113113
image_url=fluxcd/${{ env.CONTROLLER }}:${{ steps.prep.outputs.version }}

0 commit comments

Comments
 (0)