mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-13 13:16:36 +02:00
Code Issues Releases Wiki Activity

[ticket/17396] Adjust merge code

Browse Source 
PHPBB-17396
This commit is contained in:
Marc Alexander
2024-09-17 22:10:28 +02:00
parent 3d70d87b57
commit 4fb06b00b7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/check_merge_to_master.yml vendored
View File

@ -28,7 +28,8 @@ jobs:
id: simulate_merge id: simulate_merge
run: | run: |
git checkout 3.3.x git checkout 3.3.x
git merge --no-ff ${{ github.event.pull_request.head.sha }} || exit 1 git fetch origin pull/${{ github.event.pull_request.number }}/head
git merge --no-ff FETCH_HEAD || exit 1
- name: Attempt to merge updated 3.3.x into master - name: Attempt to merge updated 3.3.x into master
id: merge_master id: merge_master