Skip to content

Commit ad74919

Browse files
committed
ci: try to merge and log if it fails
1 parent 79ab9f8 commit ad74919

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/workflows/node.js.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ jobs:
8484
git remote add forkUpstream https://github.com/$REPO_NAME # URL of the fork
8585
git fetch forkUpstream # Fetch fork
8686
87+
- name: Attempt to merge target
88+
env:
89+
TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
90+
run: git merge origin/$TARGET_BRANCH --no-commit --no-ff || echo "Failed to merge target branch"
91+
8792
- name: Compute git diff
8893
env:
8994
CURRENT_BRANCH: ${{ github.head_ref }}

0 commit comments

Comments
 (0)