Skip to content

fix: Upgrade go version 1.24.6 in release-3.5.x - #19096

Merged
ashwanthgoli merged 3 commits into
release-3.5.xfrom
patch-release-3.5
Sep 4, 2025
Merged

fix: Upgrade go version 1.24.6 in release-3.5.x#19096
ashwanthgoli merged 3 commits into
release-3.5.xfrom
patch-release-3.5

Conversation

@shantanualsi

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@shantanualsi shantanualsi changed the title Upgrade go version 1.24.6 Sep 3, 2025
@shantanualsi
shantanualsi marked this pull request as ready for review September 3, 2025 08:40
@shantanualsi
shantanualsi requested a review from a team as a code owner September 3, 2025 08:40
@shantanualsi shantanualsi changed the title chore: Upgrade go version 1.24.6 Sep 3, 2025
@shantanualsi shantanualsi changed the title chore: Upgrade go version 1.24.6 in release-3.5.x Sep 3, 2025

@ashwanthgoli ashwanthgoli left a comment

Copy link
Copy Markdown
Contributor

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 ce8d705 into release-3.5.x Sep 4, 2025
68 checks passed
@ashwanthgoli
ashwanthgoli deleted the patch-release-3.5 branch September 4, 2025 05:24
@loki-gh-app

loki-gh-app Bot commented Sep 4, 2025

Copy link
Copy Markdown
Contributor

The backport to release-3.5.x 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-19096-to-release-3.5.x origin/release-3.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x ce8d70506c5bd905dd7ec7db8f174b9fcd264f30

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-19096-to-release-3.5.x
# Create the PR body template
PR_BODY=$(gh pr view 19096 --json body --template 'Backport ce8d70506c5bd905dd7ec7db8f174b9fcd264f30 from #19096{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix: Upgrade go version 1.24.6 in release-3.5.x (backport release-3.5.x)' --body-file - --label 'size/S' --label 'type/bug' --label 'backport' --base release-3.5.x --milestone release-3.5.x --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-19096-to-release-3.5.x

# Create a pull request where the `base` branch is `release-3.5.x` and the `compare`/`head` branch is `backport-19096-to-release-3.5.x`.

# Remove the local backport branch
git switch main
git branch -D backport-19096-to-release-3.5.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants