From 2035a5630488af51dc5e59ee25c5a41e2ba1c183 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 00:51:34 +0100 Subject: [PATCH] . --- .gitea/workflows/convert-build-to-yml.yml | 2 +- .gitea/workflows/convert-to-xml.yml | 2 +- .gitea/workflows/convert-to-yml.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/convert-build-to-yml.yml b/.gitea/workflows/convert-build-to-yml.yml index 630a8c6..4fc5813 100644 --- a/.gitea/workflows/convert-build-to-yml.yml +++ b/.gitea/workflows/convert-build-to-yml.yml @@ -36,7 +36,7 @@ jobs: git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" git add -A - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git checkout ${{ env.DEVELOPMENT_BRANCH }} git merge --squash ${{ github.ref_name }} git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} diff --git a/.gitea/workflows/convert-to-xml.yml b/.gitea/workflows/convert-to-xml.yml index 36696aa..109b498 100644 --- a/.gitea/workflows/convert-to-xml.yml +++ b/.gitea/workflows/convert-to-xml.yml @@ -30,5 +30,5 @@ jobs: git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" 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 commit -a -m ""${{ github.ref_name }} -> refs/heads/deployed-${{ github.ref_name }} "" git push 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 6a01ca8..abba34f 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -48,7 +48,7 @@ jobs: git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A git status - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} #- name: push development # env: