From a88e8d7a592ef3bad069ddebd09341861783549d Mon Sep 17 00:00:00 2001 From: giles Date: Sat, 21 Oct 2023 23:47:52 +0100 Subject: [PATCH] ohiseewhatyoumean --- .gitea/workflows/build-develop-branch.yml | 2 +- .gitea/workflows/convert-to-yml.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index 39695f8..ccdd47a 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -37,7 +37,7 @@ jobs: git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} ym files converted to xml" git push -f origin HEAD:${{ env.BUILD_BRANCH }} - - name: make pull request + - name: make pull request comment run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea chmod +x ./tea diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 5ebee28..861d906 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -34,6 +34,9 @@ jobs: git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} + git fetch + git merge origin/master + git push origin HEAD - name: make pull request run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea