Skip to content

Commit e4527d4

Browse files
committed
ci: merge locally in CI
1 parent f781fc9 commit e4527d4

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

.github/workflows/node.js.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ jobs:
8484
git remote add forkUpstream https://github.com/$REPO_NAME # URL of the fork
8585
git fetch forkUpstream # Fetch fork
8686
87+
- name: Merge in target branch to avoid false negatives.
88+
env:
89+
TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
90+
run: |
91+
git merge origin/$TARGET_BRANCH
92+
8793
- name: Compute git diff
8894
env:
8995
CURRENT_BRANCH: ${{ github.head_ref }}

0 commit comments

Comments
 (0)