Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Lint code with PHP 8.4 #295

Merged
merged 1 commit into from
Sep 24, 2024
Merged

[CI] Lint code with PHP 8.4 #295

merged 1 commit into from
Sep 24, 2024

Conversation

brotkrueml
Copy link
Contributor

Releases: main, 12.4

Releases: main, 12.4
@linawolf linawolf merged commit 427b791 into main Sep 24, 2024
13 checks passed
@linawolf linawolf deleted the php-84 branch September 24, 2024 05:39
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 68febc6... [CI] Lint code with PHP 8.4
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging .github/workflows/tests.yml
Auto-merging Build/Scripts/runTests.sh
CONFLICT (content): Merge conflict in Build/Scripts/runTests.sh

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-295-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 68febc618caf4b663968e73a0c539b60bdea7acb
# Push it to GitHub
git push --set-upstream origin backport-295-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-295-to-12.4.

@linawolf
Copy link
Member

@brotkrueml automatic backport failed, please make a manual backport if desired

brotkrueml added a commit that referenced this pull request Sep 24, 2024
linawolf pushed a commit that referenced this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants