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.1 #15148

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

loki-gh-app[bot]
Copy link
Contributor

@loki-gh-app loki-gh-app bot commented Nov 27, 2024

🤖 I have created a release beep boop

3.3.1

3.3.1 (2024-12-04)

⚠ BREAKING CHANGES

  • Remove wget from Promtail docker image (backport release-3.3.x) (#15146)

Miscellaneous Chores

  • Remove wget from Promtail docker image (backport release-3.3.x) (#15146) (0f5a994)

Merging this PR will release the artifacts of 60f2af3

@loki-gh-app loki-gh-app bot requested a review from a team as a code owner November 27, 2024 11:39
@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 Nov 27, 2024
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Nov 27, 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 Nov 27, 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 9 times, most recently from c17dc2a to 7394402 Compare December 3, 2024 22:47
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.3.x branch from 7394402 to 4c4fc7d Compare December 4, 2024 16:29
@loki-gh-app loki-gh-app bot force-pushed the release-please--branches--release-3.3.x branch from 4c4fc7d to b9108cc Compare December 4, 2024 17:38
@cstyan cstyan merged commit 4120a47 into release-3.3.x Dec 4, 2024
60 checks passed
@cstyan cstyan deleted the release-please--branches--release-3.3.x branch December 4, 2024 21:57
@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Dec 4, 2024

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

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-15148-to-main
# Create the PR body template
PR_BODY=$(gh pr view 15148 --json body --template 'Backport 4120a47b554f236a94134d2025b810b6fc951490 from #15148{{ "\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.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-15148-to-main

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

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

@loki-gh-app
Copy link
Contributor Author

loki-gh-app bot commented Dec 4, 2024

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