chore(release-2.9.x): release 2.9.6 #12121
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![loki-gh-app[bot]](https://avatars.githubusercontent.com/u/7195757?s=60&v=4){kind=small}
loki-gh-app
bot
added
autorelease: pending
backport main
|
This PR must be merged before a backport PR will be created. |
1 similar comment
|
This PR must be merged before a backport PR will be created. |
loki-gh-app
bot
force-pushed
the
release-please--branches--release-2.9.x
branch
from
0e653a9
to
680e701
Compare
loki-gh-app
bot
force-pushed
the
release-please--branches--release-2.9.x
branch
2 times, most recently
from
5ccface
to
de63600
Compare
loki-gh-app
bot
force-pushed
the
release-please--branches--release-2.9.x
branch
from
de63600
to
ce4904c
Compare
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-12121-to-main origin/main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f7fecd1dc349d98124d10b8782a54bd7bd7f3e1aWhen the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-12121-to-main
# Create the PR body template
PR_BODY=$(gh pr view 12121 --json body --template 'Backport f7fecd1dc349d98124d10b8782a54bd7bd7f3e1a from #12121{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "chore: [main] chore(release-2.9.x): release 2.9.6" --body-file - --label "size/S" --label "product-approved" --label "autorelease: pending" --label "backport" --base main --milestone main --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-12121-to-main
# Create a pull request where the `base` branch is `main` and the `compare`/`head` branch is `backport-12121-to-main`.
# Remove the local backport branch
git switch main
git branch -D backport-12121-to-main |
MichelHollands
pushed a commit
that referenced
this pull request
Mar 22, 2024
Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com> (cherry picked from commit f7fecd1)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🤖 I have created a release beep boop
2.9.6
2.9.6 (2024-03-21)
Bug Fixes
net.JoinHostPortto support IPv6 addresses (#10650) (#11870) (7def3b4)Merging this PR will release the artifacts of 3186520