Skip to content

chore(release-3.6.x): release 3.6.11 - #21485

Merged
sandeepsukhani merged 1 commit into
release-3.6.xfrom
release-please--branches--release-3.6.x
May 13, 2026
Merged

chore(release-3.6.x): release 3.6.11#21485
sandeepsukhani merged 1 commit into
release-3.6.xfrom
release-please--branches--release-3.6.x

Conversation

@loki-gh-app

@loki-gh-app loki-gh-app Bot commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

🤖 I have created a release beep boop

3.6.11

3.6.11 (2026-05-13)

Bug Fixes

  • CVEs in release 3.6.x (#21773) (1fe3b6d)
  • deps: update module github.com/aws/aws-sdk-go-v2/service/s3 to v1.97.3 [security] (release-3.6.x) (#21459) (11c1d07)
  • deps: update module go.opentelemetry.io/otel/sdk to v1.43.0 [security] (release-3.6.x) (#21480) (47fb29e)
  • storage: attach SHA-256 checksum on PutObject for Object Lock buckets (#21848) (2a7c34c)

Merging this PR will release the artifacts of f7a4aa9

@loki-gh-app
loki-gh-app Bot requested a review from a team as a code owner April 9, 2026 13:10
@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 9, 2026
@loki-gh-app
loki-gh-app Bot force-pushed the release-please--branches--release-3.6.x branch 2 times, most recently from 9b6c8d8 to ba88805 Compare April 9, 2026 14:11
@loki-gh-app
loki-gh-app Bot force-pushed the release-please--branches--release-3.6.x branch from ba88805 to ce66d83 Compare May 13, 2026 08:43
@sandeepsukhani
sandeepsukhani merged commit 69ba8d8 into release-3.6.x May 13, 2026
83 checks passed
@sandeepsukhani
sandeepsukhani deleted the release-please--branches--release-3.6.x branch May 13, 2026 11:03
@loki-gh-app

loki-gh-app Bot commented May 13, 2026

Copy link
Copy Markdown
Contributor Author

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

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

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

# Remove the local backport branch
git switch main
git branch -D backport-21485-to-main
@loki-gh-app

loki-gh-app Bot commented May 13, 2026

Copy link
Copy Markdown
Contributor Author
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

1 participant