update current ref

zardoy · Sep 11, 2024 · 16bb43c · 16bb43c
1 parent 5a3fb6f
commit 16bb43c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,6 @@ jobs:
       - name: print current ref
         run: echo ${{ github.event.pull_request.base.ref }}
       - run: node scripts/outdatedGitPackages.mjs
-        if: ${{ github.event.pull_request.base.ref == 'next' }}
+        if: ${{ github.event.pull_request.base.ref == 'release' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/merge-next.yml b/.github/workflows/merge-next.yml
@@ -17,10 +17,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0 # Fetch all history so we can merge branches
+          ref: refs/pull/${{ github.event.issue.number }}/head
       - name: Fetch All Branches
         run: git fetch --all
-      - name: Checkout PR
-        run: git checkout ${{ github.event.issue.pull_request.head.ref }}
+      # - name: Checkout PR
+      #   run: git checkout ${{ github.event.issue.pull_request.head.ref }}
       - name: Merge From Next
         run: git merge origin/next --strategy-option=theirs
       - name: Push Changes