Skip to content

Commit a3359f2

Browse files
committed
fix(actions/flux-localhost-build): update or create
1 parent 184ce4c commit a3359f2

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

.github/workflows/flux-localhost-build.yaml

+15-11
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,20 @@ jobs:
8282
export MESSAGE="${{ env.MESSAGE }}"
8383
export SHA=$( git rev-parse ${{ env.DESTINATION_BRANCH }}:${{ env.FILE_TO_COMMIT }} )
8484
export CONTENT=$( base64 -i ${{ env.FILE_TO_COMMIT }} )
85-
gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \
86-
--field message="${MESSAGE}" \
87-
--field content="${CONTENT}" \
88-
--field encoding="base64" \
89-
--field branch="${{ env.DESTINATION_BRANCH }}" \
90-
--field sha="${SHA}" \
91-
|| gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \
92-
--field message="${MESSAGE}" \
93-
--field content="${CONTENT}" \
94-
--field encoding="base64" \
95-
--field branch="${{ env.DESTINATION_BRANCH }}" \
85+
if gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \
86+
--field message="${MESSAGE}" \
87+
--field content="${CONTENT}" \
88+
--field encoding="base64" \
89+
--field branch="${{ env.DESTINATION_BRANCH }}" \
90+
--field sha="${SHA}" ; then
91+
echo "Pushed signed commit to GitHub."
92+
else if gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \
93+
--field message="${MESSAGE}" \
94+
--field content="${CONTENT}" \
95+
--field encoding="base64" \
96+
--field branch="${{ env.DESTINATION_BRANCH }}" \
97+
echo "Pushed signed commit to GitHub."
98+
else
9699
|| echo "No changes to push or errored pushing."
100+
fi
97101
gh pr create --base main --head ${{ env.BRANCH }} --title "${{ env.MESSAGE }}" --body "Updates Flux install manifests, patched for use with localhost hostNetwork, to the ${{ env.FLUX_VERSION }} version." --reviewer ${{ github.repository_owner }}

.github/workflows/renovate-rebase.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
name: "Renovate (Manual Rebase Re-run)"
55

66
on:
7-
push:
8-
branches: ["renovate/**"]
7+
# push:
8+
# branches: ["renovate/**"]
99

1010
jobs:
1111
renovate:
1212
name: Renovate
1313
uses: ./.github/workflows/renovate.yaml
14-
secrets: inherit
14+
secrets: inherit

0 commit comments

Comments
 (0)