From 7ffe27e53ef12788e85d4272630505de5ccc94b6 Mon Sep 17 00:00:00 2001 From: Continuous Integration <> Date: Mon, 23 Oct 2023 12:03:38 +0000 Subject: [PATCH] build/1002 -> develop/1002 --- .gitea/workflows/develop -> build.yml | 6 ++++++ .gitea/workflows/pr-closed.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 6c7b0b5..ab5bf6b 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -40,6 +40,12 @@ jobs: CI_COMMIT_MESSAGE: Development branch built to xml. CI_COMMIT_AUTHOR: Continuous Integration run: | + 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 "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " + git checkout -b ${{ env.BUILD_BRANCH }} + git merge --squash ${{ github.ref_name }} if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git -C ../cloned fetch origin #--depth=1 diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index ba3f6fc..0f10aa6 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -4,6 +4,7 @@ on: pull_request: types: - closed + - deleted branches: - 'master'