Merge pull request 'Commit 2' (#1) from dev into release
Reviewed-on: #1
This commit is contained in:
commit
44eb060410
24
.gitea/workflows/merge.yml
Normal file
24
.gitea/workflows/merge.yml
Normal file
@ -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
|
||||||
Loading…
Reference in New Issue
Block a user