make sure starting branch is correct

helmholtz-analytics · Aug 2, 2023 · feb7198 · feb7198
1 parent 10c8cde
commit feb7198
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/merge-release-changes-to-main.yml b/.github/workflows/merge-release-changes-to-main.yml
@@ -16,14 +16,16 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ github.repository }} == 'hemlholtz-analytics/heat'
         steps:
-            - uses: actions/checkout@v3
-              with:
-                token: ${{ secrets.GITHUB_TOKEN }}
-                ref: '${{ env.starting_branch }}'
+            # - uses: actions/checkout@v3
+            #   with:
+            #     token: ${{ secrets.GITHUB_TOKEN }}
+            #     ref: '${{ env.starting_branch }}'
             - name: Delete working branch if it already exists
               run: git push --delete origin ${{ env.working_branch }} || true
             - name: Create working branch
               run: |
+                git checkout ${{ env.starting_branch }}
+                git pull
                 git checkout -b ${{ env.working_branch }}
                 git push --set-upstream origin ${{ env.working_branch }}
             - name: Create a pull request