From d923febdaedd10f7b9060fbf66044de78b1ac044 Mon Sep 17 00:00:00 2001 From: "isaac.hatilima" Date: Tue, 26 Sep 2023 09:23:41 +0200 Subject: [PATCH] Commit 2 --- .gitea/workflows/merge.yml | 24 ++++++++++++++++++++++++ README.md | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/merge.yml diff --git a/.gitea/workflows/merge.yml b/.gitea/workflows/merge.yml new file mode 100644 index 0000000..e014667 --- /dev/null +++ b/.gitea/workflows/merge.yml @@ -0,0 +1,24 @@ +name: Merge Release to Master + +on: + push: + branches: + - release + +jobs: + merge-branch: + runs-on: ubuntu-latest + steps: + - name: Checkout Release Branch + uses: actions/checkout@v2 + with: + ref: release + fetch-depth: 0 # fetch full history for all tags and branches + + - name: Merge Release into Master + run: | + git config user.email gitea-actions + git config user.name noreply+github-actions@springer-dl.de + git merge origin/master -m "automated merge" \ + --no-ff + git push origin release:master diff --git a/README.md b/README.md index 0fb17da..2a12be1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# action-test READ ME +# action-test READ ME 1