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

Update to Go 1.21 #11654

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Update to Go 1.21 #11654

merged 3 commits into from
Oct 5, 2023

Conversation

axw
Copy link
Member

@axw axw commented Sep 18, 2023

Motivation/summary

Needed for updating elastic-package. script/update_go_version.sh has been updated to use Go 1.21's go get go@major.minor for updating the Go toolchain version. This is a step towards removing the need for gimme.

Checklist

- [ ] Update CHANGELOG.asciidoc
- [ ] Update package changelog.yml (only if changes to apmpackage have been made)

  • Documentation has been updated

How to test these changes

N/A

Related issues

#11643

@mergify
Copy link
Contributor

mergify bot commented Sep 18, 2023

This pull request does not have a backport label. Could you fix it @axw? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Sep 18, 2023
Needed for updating elastic-package.
@axw axw marked this pull request as ready for review September 18, 2023 05:58
@axw axw requested a review from a team as a code owner September 18, 2023 05:58
dmathieu
dmathieu previously approved these changes Sep 18, 2023
@axw
Copy link
Member Author

axw commented Sep 18, 2023

I'll leave this until @simitt is back, someone will get in touch with Snyk about the errors - seems their go.mod parser hasn't been updated to handle Go 1.21 toolchain directives yet.

kruskall
kruskall previously approved these changes Sep 18, 2023
@mergify
Copy link
Contributor

mergify bot commented Sep 27, 2023

This pull request is now in conflicts. Could you fix it @axw? 🙏
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 update-go-1.21 upstream/update-go-1.21
git merge upstream/main
git push upstream update-go-1.21

simitt
simitt previously approved these changes Oct 5, 2023
@axw axw dismissed stale reviews from simitt, kruskall, and dmathieu via 2cc1b14 October 5, 2023 06:37
@axw axw requested a review from simitt October 5, 2023 06:37
@axw axw enabled auto-merge (squash) October 5, 2023 06:37
@axw axw disabled auto-merge October 5, 2023 07:07
@axw axw enabled auto-merge (squash) October 5, 2023 07:07
@axw axw merged commit aac0b69 into elastic:main Oct 5, 2023
13 of 15 checks passed
@axw axw deleted the update-go-1.21 branch October 5, 2023 07:12
carsonip pushed a commit that referenced this pull request Oct 5, 2023
Needed for updating elastic-package.

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
Signed-off-by: Carson Ip <carson.ip@elastic.co>
@axw axw added backport-8.10 Automated backport with mergify backport-8.11 Automated backport with mergify labels Oct 11, 2023
@axw axw removed the backport-skip Skip notification from the automated backport with mergify label Oct 11, 2023
@axw
Copy link
Member Author

axw commented Oct 11, 2023

@Mergifyio backport 8.10 8.11

@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2023

backport 8.10 8.11

❌ No backport have been created

  • Backport to branch 8.10 failed

Git reported the following error:

To https://github.com/elastic/apm-server
 ! [rejected]            mergify/bp/8.10/pr-11654 -> mergify/bp/8.10/pr-11654 (non-fast-forward)
error: failed to push some refs to 'https://github.com/elastic/apm-server'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

mergify bot pushed a commit that referenced this pull request Oct 11, 2023
Needed for updating elastic-package.

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
(cherry picked from commit aac0b69)

# Conflicts:
#	.go-version
#	docs/version.asciidoc
#	go.sum
#	packaging/docker/Dockerfile
#	systemtest/go.sum
#	tools/go.mod
#	tools/go.sum
mergify bot pushed a commit that referenced this pull request Oct 11, 2023
Needed for updating elastic-package.

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
(cherry picked from commit aac0b69)
mergify bot added a commit that referenced this pull request Oct 11, 2023
Needed for updating elastic-package.

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
(cherry picked from commit aac0b69)

Co-authored-by: Andrew Wilkins <axw@elastic.co>
mergify bot added a commit that referenced this pull request Oct 11, 2023
* Update to Go 1.21 (#11654)

Needed for updating elastic-package.

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
(cherry picked from commit aac0b69)

# Conflicts:
#	.go-version
#	docs/version.asciidoc
#	go.sum
#	packaging/docker/Dockerfile
#	systemtest/go.sum
#	tools/go.mod
#	tools/go.sum

* Fix merge conflicts

---------

Co-authored-by: Andrew Wilkins <axw@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.10 Automated backport with mergify backport-8.11 Automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants