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-3.3.x): release 3.3.3 #15520

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

loki-gh-app[bot]
Copy link
Contributor

@loki-gh-app loki-gh-app bot commented Dec 20, 2024

🤖 I have created a release beep boop

3.3.3

3.3.3 (2025-02-12)

Bug Fixes

  • build: update build info 3 3 x (#16169) (4672625)
  • ci: Provide correct build info for release builds (#15939) (#16214) (e5f80d3)
  • ci: Revert "fixed Publish Rendered Helm Chart Diff workflow" (#15511) (09d1085)
  • correct typo in architecture name (amr64 -> arm64) (backport release-3.3.x) (#15715) (9acdc33)
  • deps: CVE updates for Loki 3.3.2 (#15645) (01a7a0d)

Merging this PR will release the artifacts of 8f985a8

@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 labels Dec 20, 2024
@loki-gh-app loki-gh-app bot requested a review from a team as a code owner December 20, 2024 10:35
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Dec 20, 2024

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 Dec 20, 2024

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.3.x branch 6 times, most recently from cf55a1e to 7260ba9 Compare January 9, 2025 13:49
@pull-request-size pull-request-size bot added size/S and removed size/XS labels Jan 9, 2025
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.3.x branch 10 times, most recently from 958b571 to 72b1098 Compare January 17, 2025 19:31
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.3.x branch 2 times, most recently from 9a2fe97 to 1a41c26 Compare January 24, 2025 13:51
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.3.x branch from 1a41c26 to 4a44f02 Compare February 12, 2025 15:36
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.3.x branch from 4a44f02 to 4eae2f6 Compare February 12, 2025 21:26
Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ashwanthgoli ashwanthgoli merged commit 0349111 into release-3.3.x Feb 13, 2025
60 checks passed
@ashwanthgoli ashwanthgoli deleted the release-please--branches--release-3.3.x branch February 13, 2025 07:00
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Feb 13, 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-15520-to-main origin/main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 0349111a2c845df6d33531d81fac144dab9ff296

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

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

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

@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Feb 13, 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