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

Github Action PHPStan Matrix #5169

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Jan 10, 2025

Defined Github Action PHPStan Matrix with PHP version:

  • 7.4
  • 8.0
  • 8.1
  • 8.2
  • 8.3

Instead of only 8.2

@rldhont rldhont added tests unit tests and docker configuration for tests action labels Jan 10, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Jan 10, 2025
@rldhont rldhont requested review from laurentj and Gustry January 10, 2025 13:06
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not full sure, but let's try and see.

@rldhont rldhont merged commit 65bc9e3 into 3liz:master Jan 10, 2025
20 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6daea47f7... Github Action PHPStan Matrix
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/php-stan.yml
CONFLICT (content): Merge conflict in .github/workflows/php-stan.yml

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-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5169-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6daea47f7d2aef08936a0e7ec1f1ea7c1f82f38c
# Push it to GitHub
git push --set-upstream origin backport-5169-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

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

@3liz-bot
Copy link
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 6daea47f7... Github Action PHPStan Matrix
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/php-stan.yml
CONFLICT (content): Merge conflict in .github/workflows/php-stan.yml

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-release_3_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5169-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 6daea47f7d2aef08936a0e7ec1f1ea7c1f82f38c
# Push it to GitHub
git push --set-upstream origin backport-5169-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants