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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-09-25 15:21:07 +01:00
commit a23fb62817
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/merge_3.3.x_to_master.yml vendored
View file

@ -12,6 +12,9 @@ jobs:
steps: steps:
- name: Checkout the repository - name: Checkout the repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch full history for proper merging
ref: 3.3.x # Checkout the 3.3.x branch
- name: Fetch the latest commit information - name: Fetch the latest commit information
id: get-commit-info id: get-commit-info
@ -37,9 +40,14 @@ jobs:
- name: Merge 3.3.x into master - name: Merge 3.3.x into master
run: | run: |
git checkout master git checkout master
git merge --no-ff 3.3.x if git merge --no-ff 3.3.x; then
echo "merge_failed=false" >> $GITHUB_ENV
else
echo "merge_failed=true" >> $GITHUB_ENV
fi
- name: Push changes to master - name: Push changes to master if merge was successful
if: env.merge_failed == 'false'
run: git push origin master run: git push origin master
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}