From 74394268501a84ffce493826d406b678aa457730 Mon Sep 17 00:00:00 2001 From: giles Date: Sun, 22 Oct 2023 18:48:16 +0100 Subject: [PATCH] ..... --- .gitea/workflows/build-develop-branch.yml | 2 +- .gitea/workflows/convert-to-xml.yml | 2 +- .gitea/workflows/convert-to-yml.yml | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index 6a86b57..e6802a6 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -38,7 +38,7 @@ jobs: git checkout -b ${{ env.BUILD_BRANCH }} git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml" - git push origin HEAD:${{ env.BUILD_BRANCH }} + git push-f origin HEAD:${{ env.BUILD_BRANCH }} - name: make pull request comment run: | diff --git a/.gitea/workflows/convert-to-xml.yml b/.gitea/workflows/convert-to-xml.yml index 2c9cf40..df73c83 100644 --- a/.gitea/workflows/convert-to-xml.yml +++ b/.gitea/workflows/convert-to-xml.yml @@ -28,4 +28,4 @@ jobs: git config --global user.email "username@users.noreply.github.com" git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml" - git push origin HEAD:refs/heads/deployed-${{ github.ref_name }} + -f origin HEAD:refs/heads/deployed-${{ github.ref_name }} diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 0155fb3..cc795bc 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -47,16 +47,11 @@ jobs: run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" - git fetch --depth=1 - git add -A - git stash git checkout -b ${{ env.DEVELOPMENT_BRANCH }} - git pull - git stash pop git add -A git status git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" - git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} + git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} #- name: push development # env: # CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts @@ -110,7 +105,7 @@ jobs: git checkout -b ${{ env.BUILD_BRANCH }} git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml" - git push origin HEAD:${{ env.BUILD_BRANCH }} + git push -f origin HEAD:${{ env.BUILD_BRANCH }} - name: make pull request comment run: |