Merge pull request #7219 from abpframework/auto-merge/rel-4-1/73

Merge branch rel-4.2 with rel-4.1
abpframework · Jan 14, 2021 · 0059f5b · 0059f5b
2 parents 52b8c0d + 44329df
commit 0059f5b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
@@ -4,16 +4,16 @@ on:
     branches:
       - rel-4.2
 jobs:
-  merge-dev-with-rel:
+  merge-dev-with-rel-4-2:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin $GITHUB_REF:$GITHUB_REF
-          git reset --hard $GITHUB_REF
+          git fetch origin rel-4.2:rel-4.2
+          git reset --hard rel-4.2
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with: