makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17394] Specify pull_request_target types

Browse source 
PHPBB-17394
This commit is contained in:
Marc Alexander 2024-09-16 20:17:29 +02:00
parent 15556319d9
commit e406308244
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/tests.yml vendored
View file

@ -14,6 +14,7 @@ on:
- master - master
- 'prep-release-*' - 'prep-release-*'
pull_request_target: pull_request_target:
types: [ opened, synchronize, reopened ]
branches: branches:
- 3.3.x - 3.3.x
- master - master
@ -634,9 +635,9 @@ jobs:
run: | run: |
git checkout master git checkout master
if git merge --no-ff origin/3.3.x --no-commit; then if git merge --no-ff origin/3.3.x --no-commit; then
echo "::set-output name=mergeable::true" echo "mergeable=true" >> $GITHUB_OUTPUT
else else
echo "::set-output name=mergeable::false" echo "mergeable=false" >> $GITHUB_OUTPUT
git merge --abort git merge --abort
fi fi
@ -649,9 +650,9 @@ jobs:
body: | body: |
The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR.
- Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success' || 'Conflict' }} - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }}
If there is a conflict, a separate PR will be needed to merge `3.3.x` into `master`. ${{ steps.merge_master.outputs.mergeable == 'false' && 'A separate PR will be needed to merge `3.3.x` into `master`.' || 'This PR is ready to be merged.' }}
- name: Mark job as succeeded - name: Mark job as succeeded
if: always() if: always()