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

chore(release-2.9.x): release 2.9.7 #12552

Merged

Conversation

loki-gh-app[bot]
Copy link
Contributor

@loki-gh-app loki-gh-app bot commented Apr 10, 2024

🤖 I have created a release beep boop

2.9.7

2.9.7 (2024-04-10)

Bug Fixes


Merging this PR will release the artifacts of efc4d2f

@loki-gh-app loki-gh-app bot requested a review from a team as a code owner April 10, 2024 08:14
@loki-gh-app loki-gh-app bot added autorelease: pending backport main Tag a PR with this label to create a PR which cherry pics it into the main branch product-approved labels Apr 10, 2024
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

1 similar comment
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

@MichelHollands MichelHollands merged commit fc6fcdd into release-2.9.x Apr 10, 2024
17 checks passed
@MichelHollands MichelHollands deleted the release-please--branches--release-2.9.x branch April 10, 2024 08:52
@grafanabot
Copy link
Collaborator

The backport to main failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-12552-to-main origin/main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x fc6fcdd2e31e78da40062d20c348dbad50990572

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-12552-to-main
# Create the PR body template
PR_BODY=$(gh pr view 12552 --json body --template 'Backport fc6fcdd2e31e78da40062d20c348dbad50990572 from #12552{{ "\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.7" --body-file - --label "size/XS" --label "product-approved" --label "autorelease: pending" --label "backport" --base main --milestone main --web

Or, 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-12552-to-main

# Create a pull request where the `base` branch is `main` and the `compare`/`head` branch is `backport-12552-to-main`.

# Remove the local backport branch
git switch main
git branch -D backport-12552-to-main

@grafanabot
Copy link
Collaborator

MichelHollands pushed a commit that referenced this pull request Apr 10, 2024
Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com>
(cherry picked from commit fc6fcdd)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autorelease: tagged backport main Tag a PR with this label to create a PR which cherry pics it into the main branch backport-failed product-approved size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants