diff --git a/.github/workflows/flux-localhost-build.yaml b/.github/workflows/flux-localhost-build.yaml index 2cf4839f..b77bc006 100644 --- a/.github/workflows/flux-localhost-build.yaml +++ b/.github/workflows/flux-localhost-build.yaml @@ -82,16 +82,20 @@ jobs: export MESSAGE="${{ env.MESSAGE }}" export SHA=$( git rev-parse ${{ env.DESTINATION_BRANCH }}:${{ env.FILE_TO_COMMIT }} ) export CONTENT=$( base64 -i ${{ env.FILE_TO_COMMIT }} ) - gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \ - --field message="${MESSAGE}" \ - --field content="${CONTENT}" \ - --field encoding="base64" \ - --field branch="${{ env.DESTINATION_BRANCH }}" \ - --field sha="${SHA}" \ - || gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \ - --field message="${MESSAGE}" \ - --field content="${CONTENT}" \ - --field encoding="base64" \ - --field branch="${{ env.DESTINATION_BRANCH }}" \ + if gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \ + --field message="${MESSAGE}" \ + --field content="${CONTENT}" \ + --field encoding="base64" \ + --field branch="${{ env.DESTINATION_BRANCH }}" \ + --field sha="${SHA}" ; then + echo "Pushed signed commit to GitHub." + else if gh api --method PUT /repos/:owner/:repo/contents/${{ env.FILE_TO_COMMIT }} \ + --field message="${MESSAGE}" \ + --field content="${CONTENT}" \ + --field encoding="base64" \ + --field branch="${{ env.DESTINATION_BRANCH }}" \ + echo "Pushed signed commit to GitHub." + else || echo "No changes to push or errored pushing." + fi 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 }} diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml index 3e0dc4b3..3e5d295f 100644 --- a/.github/workflows/renovate-rebase.yaml +++ b/.github/workflows/renovate-rebase.yaml @@ -4,11 +4,11 @@ name: "Renovate (Manual Rebase Re-run)" on: - push: - branches: ["renovate/**"] +# push: +# branches: ["renovate/**"] jobs: renovate: name: Renovate uses: ./.github/workflows/renovate.yaml - secrets: inherit \ No newline at end of file + secrets: inherit