ci: try to fix the commands

zardoy · Sep 8, 2024 · f9a4960 · f9a4960
1 parent d743981
commit f9a4960
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,8 @@ jobs:
         with:
           name: cypress-images
           path: cypress/integration/__image_snapshots__/
+      - name: print current ref
+        run: echo ${{ github.ref }}
       - run: node scripts/outdatedGitPackages.mjs
         if: ${{ github.ref == 'refs/heads/next' }}
         env:

diff --git a/.github/workflows/merge-next.yml b/.github/workflows/merge-next.yml
@@ -15,9 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: refs/pull/${{ github.event.issue.number }}/head
+          fetch-depth: 0 # Fetch all history so we can merge branches
+      - name: Fetch All Branches
+        run: git fetch --all
       - name: Merge From Next
-        run: git merge next --strategy-option=theirs
+        run: git merge origin/next --strategy-option=theirs
       - name: Push Changes
         uses: ad-m/github-push-action@master
         with: