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.10 #13837

Merged

Conversation

loki-gh-app[bot]
Copy link
Contributor

@loki-gh-app loki-gh-app bot commented Aug 9, 2024

🤖 I have created a release beep boop

2.9.10

2.9.10 (2024-08-09)

Bug Fixes


Merging this PR will release the artifacts of 7664eda

@loki-gh-app loki-gh-app bot requested a review from a team as a code owner August 9, 2024 17:13
@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 Aug 9, 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.

@vlad-diachenko vlad-diachenko force-pushed the release-please--branches--release-2.9.x branch from bd37a17 to 57f1684 Compare August 9, 2024 17:23
@pull-request-size pull-request-size bot added size/S and removed size/XS labels Aug 9, 2024
@vlad-diachenko vlad-diachenko force-pushed the release-please--branches--release-2.9.x branch from 57f1684 to 3d63544 Compare August 9, 2024 17:24
Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
@vlad-diachenko vlad-diachenko force-pushed the release-please--branches--release-2.9.x branch from 3d63544 to e6314b7 Compare August 9, 2024 17:25
@vlad-diachenko vlad-diachenko merged commit ee9e189 into release-2.9.x Aug 9, 2024
43 of 44 checks passed
@vlad-diachenko vlad-diachenko deleted the release-please--branches--release-2.9.x branch August 9, 2024 17:37
@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-13837-to-main origin/main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ee9e1895f84d9d774f3e16a31482be81e2c7bd11

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-13837-to-main
# Create the PR body template
PR_BODY=$(gh pr view 13837 --json body --template 'Backport ee9e1895f84d9d774f3e16a31482be81e2c7bd11 from #13837{{ "\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.10' --body-file - --label 'size/S' --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-13837-to-main

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

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

@grafanabot
Copy link
Collaborator

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/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants