From 59294bcc64b04f22d0f6621045541c8ea933a5cf Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Mon, 20 May 2024 06:42:09 +0800 Subject: [PATCH] fix(actions/flux-localhost-build): force push --- .github/workflows/flux-localhost-build.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flux-localhost-build.yaml b/.github/workflows/flux-localhost-build.yaml index ce4dfac9..be6a118d 100644 --- a/.github/workflows/flux-localhost-build.yaml +++ b/.github/workflows/flux-localhost-build.yaml @@ -63,8 +63,9 @@ jobs: git config user.name "${{ secrets.BOT_USERNAME }}[bot]" git config user.email "${{ secrets.BOT_USERNAME }} <${{ secrets.BOT_API_ID }}+${{ secrets.BOT_USERNAME }}[bot]@users.noreply.github.com>" # get $BOT_API_ID from `curl -s 'https://api.github.com/users/$(BOT_USERNAME)%5Bbot%5D' | yq .id` - git checkout ${{ env.BRANCH }} || git checkout -b ${{ env.BRANCH }} main - git pull --rebase --autostash origin ${{ env.BRANCH }} || true + git checkout -b ${{ env.BRANCH }} main + #git checkout ${{ env.BRANCH }} || git checkout -b ${{ env.BRANCH }} main + #git pull --rebase --autostash origin ${{ env.BRANCH }} || true mkdir -p /tmp/flux flux pull artifact oci://ghcr.io/fluxcd/flux-manifests:v${{ env.FLUX_VERSION }} --output /tmp/flux/ @@ -72,5 +73,5 @@ jobs: git add ./kube/bootstrap/flux/flux-install-localhost-manifests.yaml git commit --message "${{ env.MESSAGE }}" - git push origin ${{ env.BRANCH }} + git push origin ${{ env.BRANCH }} --force gh pr create --title "${{ env.MESSAGE }}" --body "Updates Flux install manifests, patched for use with localhost hostNetwork, to the ${{ env.FLUX_VERSION }} version." --reviewer ${{ github.repository_owner }}