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.x](backport #6700) [Automation] Bump Golang version to 1.22.12 #6835

Merged
merged 3 commits into from
Feb 13, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025

It requires the version to be bumped first in golang-crossbuild project, then a new release will be added to:
https://github.com/elastic/golang-crossbuild/releases/tag/v1.22.12.
Otherwise it will fail until the docker images are available.


Bump golang-version to latest version

Update .go-version

1 file(s) updated with "1.22.12": * .go-version

1.22.11
no GitHub Release found for go1.22.11 on "https://github.com/golang/go"
1.22.12
no GitHub Release found for go1.22.12 on "https://github.com/golang/go"
Update version.asciidoc

1 file(s) updated with ":go-version: 1.22.12": * version/docs/version.asciidoc

1.22.12
no GitHub Release found for go1.22.12 on "https://github.com/golang/go"
Update .golangci.yml

1 file(s) updated with "1.22.12": * .golangci.yml

1.22.12
no GitHub Release found for go1.22.12 on "https://github.com/golang/go"
Update go.mod version

1 file(s) updated with "go 1.22.12": * go.mod

1.22.12
no GitHub Release found for go1.22.12 on "https://github.com/golang/go"
Update from dockerfiles

2 file(s) updated with "ARG GO_VERSION=1.22.12": * Dockerfile * Dockerfile.skaffold

1.22.12
no GitHub Release found for go1.22.12 on "https://github.com/golang/go"
GitHub Action workflow link
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!


This is an automatic backport of pull request #6700 done by [Mergify](https://mergify.com).

* chore: Update .go-version

Made with ❤️️ by updatecli

* Add changelog.

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update go.mod version

Made with ❤️️ by updatecli

* chore: Update from dockerfiles

Made with ❤️️ by updatecli

* chore: Update .golangci.yml

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* Update changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit a29af64)

# Conflicts:
#	.golangci.yml
#	Dockerfile
#	Dockerfile.skaffold
#	go.mod
#	version/docs/version.asciidoc
@mergify mergify bot requested a review from a team as a code owner February 12, 2025 15:22
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 12, 2025
@mergify mergify bot requested review from blakerouse and kaanyalti and removed request for a team February 12, 2025 15:22
Copy link
Contributor Author

mergify bot commented Feb 12, 2025

Cherry-pick of a29af64 has failed:

On branch mergify/bp/8.x/pr-6700
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit a29af6489.
  (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:   .go-version
	new file:   changelog/fragments/1738617834-Upgrade-to-Go-1.22.11..yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .golangci.yml
	both modified:   Dockerfile
	both modified:   Dockerfile.skaffold
	both modified:   go.mod
	both modified:   version/docs/version.asciidoc

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 12, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Feb 12, 2025
@v1v v1v enabled auto-merge (squash) February 12, 2025 16:56
Copy link

@v1v v1v merged commit f3d13d6 into 8.x Feb 13, 2025
14 checks passed
@v1v v1v deleted the mergify/bp/8.x/pr-6700 branch February 13, 2025 01:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants