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

[ticket/17396] Fetch full history and branch 3.3.x if merging to master

Browse source 
PHPBB-17396
This commit is contained in:
Marc Alexander 2024-09-19 20:48:21 +02:00
parent 17d066a980
commit d6a17c1fe7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.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
@ -35,9 +38,7 @@ jobs:
run: git fetch --all run: git fetch --all
- name: Merge 3.3.x into master - name: Merge 3.3.x into master
# First checkout 3.3.x and master to track from origin, then try merging to master
run: | run: |
git checkout 3.3.x
git checkout master git checkout master
if git merge --no-ff 3.3.x; then if git merge --no-ff 3.3.x; then
echo "merge_failed=false" >> $GITHUB_ENV echo "merge_failed=false" >> $GITHUB_ENV