Merge branch 'release/2' into release/1

# Conflicts:
#	.github/workflows/merge-forward.yaml

.github/workflows/merge-forward.yaml

@@ -4,12 +4,12 @@ on:
   push:
     branches:
       - release/*
+    paths:
+      - '.github/**'
 
 jobs:
   merge_commit:
     runs-on: ubuntu-latest
-    env:
-      RELEASE_BRANCH: main
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -21,14 +21,20 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "DevOps ${{ github.workflow }}"
 
+    - name: Read release branch from file
+      id: read_branch
+      run: |
+        RELEASE_BRANCH=$(cat release_branch.txt)
+        echo "::set-output name=branch::${RELEASE_BRANCH}"
+
     - name: Merge and push
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         set -e -v
         
         gitcommit=$(git rev-parse HEAD)
-        git checkout $RELEASE_BRANCH
+        git checkout ${{ steps.read_branch.outputs.branch }}
         
         git merge $gitcommit --no-ff
         

release_branch.txt

@@ -0,0 +1 @@
+main