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

[8.11] build: bump go version to 1.21.3 (backport #11821) #11824

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2023

This is an automatic backport of pull request #11821 done by Mergify.
Cherry-pick of d411924 has failed:

On branch mergify/bp/8.11/pr-11821
Your branch is up to date with 'origin/8.11'.

You are currently cherry-picking commit d41192417.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   script/update_go_version.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .go-version
	both modified:   NOTICE.txt
	both modified:   cmd/intake-receiver/go.mod
	both modified:   docs/version.asciidoc
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/glog/go.mod
	both modified:   packaging/docker/Dockerfile
	both modified:   systemtest/go.mod
	both modified:   tools/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* build: bump go version

* build: also bump systemtest go toolchain version

* ci: update script to also set the toolchain version

* build: bump gmux

* build: run go mod tidy

* build: generate notice file

(cherry picked from commit d411924)

# Conflicts:
#	.go-version
#	NOTICE.txt
#	cmd/intake-receiver/go.mod
#	docs/version.asciidoc
#	go.mod
#	go.sum
#	internal/glog/go.mod
#	packaging/docker/Dockerfile
#	systemtest/go.mod
#	tools/go.mod
@mergify mergify bot requested a review from a team as a code owner October 11, 2023 12:45
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 11, 2023
@axw
Copy link
Member

axw commented Oct 11, 2023

#11654 needs backporting first.

@axw axw closed this Oct 11, 2023
@mergify mergify bot deleted the mergify/bp/8.11/pr-11821 branch October 11, 2023 12:55
@mergify mergify bot mentioned this pull request Oct 11, 2023
3 tasks
@axw axw restored the mergify/bp/8.11/pr-11821 branch October 11, 2023 13:27
@axw axw reopened this Oct 11, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 11, 2023

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.11/pr-11821 upstream/mergify/bp/8.11/pr-11821
git merge upstream/8.11
git push upstream mergify/bp/8.11/pr-11821

@axw axw closed this Oct 11, 2023
@axw axw deleted the mergify/bp/8.11/pr-11821 branch October 11, 2023 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants