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

Update php images to latest #655

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Conversation

joehoyle
Copy link
Member

@joehoyle joehoyle commented Jan 22, 2024

5.0.13

  • [Backport v5.0-branch] Update Afterburner to 0.5.0 by @hm-backport in 263

6.0.13

  • [Backport v6.0-branch] Update Afterburner to 0.5.0 by @hm-backport in 264

8.2.12

  • [Backport v8.2-branch] Bump php from 8.2.12-fpm-bookworm to 8.2.13-fpm-bookworm by @hm-backport in 258
  • [Backport v8.2-branch] Bump php from 8.2.13-fpm-bookworm to 8.2.14-fpm-bookworm by @hm-backport in 260
  • Update Afterburner to 0.5.0 by @joehoyle in 262

5.0.13

- [Backport v5.0-branch] Update Afterburner to 0.5.0 by @hm-backport in #263

6.0.13

- [Backport v6.0-branch] Update Afterburner to 0.5.0 by @hm-backport in #264

8.2.12

- [Backport v8.2-branch] Bump php from 8.2.12-fpm-bookworm to 8.2.13-fpm-bookworm by @hm-backport in #258
- [Backport v8.2-branch] Bump php from 8.2.13-fpm-bookworm to 8.2.14-fpm-bookworm by @hm-backport in #260
- Update Afterburner to 0.5.0 by @joehoyle in #262
@joehoyle joehoyle requested a review from a team January 22, 2024 12:00
@joehoyle joehoyle merged commit d96adc7 into master Jan 22, 2024
2 checks passed
@joehoyle joehoyle deleted the bump-docker-wordpress-php-images branch January 22, 2024 12:37
@hm-backport
Copy link

hm-backport bot commented Jan 22, 2024

The backport to v15-branch failed:

Commits ["3eb1e0c48fd06880b1a5101afdee6297e5ddfb42"] could not be cherry-picked on top of v15-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v15-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 3eb1e0c48fd06880b1a5101afdee6297e5ddfb42
# Create a new branch with these backported commits.
git checkout -b backport-655-to-v15-branch
# Push it to GitHub.
git push --set-upstream origin backport-655-to-v15-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

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

@hm-backport
Copy link

hm-backport bot commented Jan 22, 2024

The backport to v16-branch failed:

Commits ["3eb1e0c48fd06880b1a5101afdee6297e5ddfb42"] could not be cherry-picked on top of v16-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v16-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 3eb1e0c48fd06880b1a5101afdee6297e5ddfb42
# Create a new branch with these backported commits.
git checkout -b backport-655-to-v16-branch
# Push it to GitHub.
git push --set-upstream origin backport-655-to-v16-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

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

@hm-backport
Copy link

hm-backport bot commented Jan 22, 2024

The backport to v17-branch failed:

Commits ["3eb1e0c48fd06880b1a5101afdee6297e5ddfb42"] could not be cherry-picked on top of v17-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v17-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 3eb1e0c48fd06880b1a5101afdee6297e5ddfb42
# Create a new branch with these backported commits.
git checkout -b backport-655-to-v17-branch
# Push it to GitHub.
git push --set-upstream origin backport-655-to-v17-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

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

@joehoyle
Copy link
Member Author

Manual backport prs:

#658
#657
#656

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