Skip to content

Conversation

@loki-gh-app
Copy link
Contributor

@loki-gh-app loki-gh-app bot commented Apr 23, 2025

🤖 I have created a release beep boop

3.5.1

3.5.1 (2025-05-19)

Features

  • prepare Loki 3.5 release (22a5221)

Bug Fixes

  • build: Bump loki-build-image for docker-driver (backport release-3.5.x) (#17741) (d4e637c)

Merging this PR will release the artifacts of d4e637c

@loki-gh-app loki-gh-app bot requested a review from a team as a code owner April 23, 2025 17:00
@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 23, 2025
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Apr 23, 2025

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

1 similar comment
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Apr 23, 2025

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

@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.5.x branch 7 times, most recently from eb30881 to 49dfe97 Compare May 2, 2025 20:53
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.5.x branch 3 times, most recently from f720ed5 to 0d860b8 Compare May 9, 2025 19:55
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.5.x branch from 0d860b8 to c3f1b59 Compare May 16, 2025 09:50
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.5.x branch from c3f1b59 to 1a7d4dc Compare May 19, 2025 17:38
@trevorwhitney trevorwhitney merged commit cbf8d90 into release-3.5.x May 19, 2025
66 checks passed
@trevorwhitney trevorwhitney deleted the release-please--branches--release-3.5.x branch May 19, 2025 20:40
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented May 19, 2025

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-17417-to-main origin/main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x cbf8d90c9340f1b4488c6fcc68dda4d56cd0e697

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-17417-to-main
# Create the PR body template
PR_BODY=$(gh pr view 17417 --json body --template 'Backport cbf8d90c9340f1b4488c6fcc68dda4d56cd0e697 from #17417{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore(release-3.5.x): release 3.5.1 (backport main)' --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-17417-to-main

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

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

@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented May 22, 2025

@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented May 22, 2025

@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented May 22, 2025

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.

1 participant