update current ref

This commit is contained in:
Vitaly Turovsky 2024-09-11 22:16:26 +03:00
commit 16bb43c7d9
2 changed files with 4 additions and 3 deletions

View file

@ -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 }}

View file

@ -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