Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 10, 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.24.10.
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.24.10": * .go-version

Update version.asciidoc

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

Update internal/edot/go.mod version

1 file(s) updated with "go 1.24.10": * internal/edot/go.mod

Update wrapper/windows/archive-proxy/go.mod version

1 file(s) updated with "go 1.24.10": * wrapper/windows/archive-proxy/go.mod

Update go.mod version

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

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 #11068 done by [Mergify](https://mergify.com).

* chore: Update go.mod version

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update wrapper/windows/archive-proxy/go.mod version

Made with ❤️️ by updatecli

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update internal/edot/go.mod version

Made with ❤️️ by updatecli

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Eric Beahan <[email protected]>
(cherry picked from commit 04611ca)

# Conflicts:
#	internal/edot/go.mod
@mergify mergify bot requested a review from a team as a code owner November 10, 2025 19:51
@mergify mergify bot added the backport label Nov 10, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 10, 2025

Cherry-pick of 04611ca has failed:

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

You are currently cherry-picking commit 04611ca8a.
  (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
	modified:   go.mod
	modified:   version/docs/version.asciidoc
	modified:   wrapper/windows/archive-proxy/go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/edot/go.mod

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

@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 10, 2025
@mergify mergify bot requested review from michalpristas and pchila and removed request for a team November 10, 2025 19:51
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Nov 10, 2025
@pchila
Copy link
Member

pchila commented Nov 11, 2025

check-ci step complaining about unnecessary go.mod for edot.
This needs to be merged after backport #11086

@pchila pchila self-assigned this Nov 11, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 13, 2025

This pull request is now in conflicts. Could you fix it? 🙏
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/9.2/pr-11068 upstream/mergify/bp/9.2/pr-11068
git merge upstream/9.2
git push upstream mergify/bp/9.2/pr-11068

@ebeahan
Copy link
Member

ebeahan commented Nov 14, 2025

check-ci step complaining about unnecessary go.mod for edot.
This needs to be merged after backport #11086

@pchila I'm going to manual address this backport to bump go to 1.24.10. We're seeing the build break in #11178 without this bump, and #11086 is taking some time to work through the conflicts.

@ebeahan ebeahan merged commit 746084c into 9.2 Nov 14, 2025
21 checks passed
@ebeahan ebeahan deleted the mergify/bp/9.2/pr-11068 branch November 14, 2025 17:57
@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @pchila

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.

4 participants