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

build-and-publish-patched-go: upgrade from 1.19.1 to 1.19.4 #93852

Merged
merged 1 commit into from
Dec 19, 2022

Conversation

ajwerner
Copy link
Contributor

@ajwerner ajwerner commented Dec 17, 2022

This picks up a mix of security and compiler fixes. The compiler fixes I'm interested in relate to generic data structures, but the other fixes seem worthwhile too.

  • Adjust the Pebble tests to run in new version.
  • Adjust version in Docker image (source).
  • Adjust version in the TeamCity agent image (setup script)
  • Rebuild and push the Docker image (following Basic Process)
  • Update build/teamcity/internal/release/build-and-publish-patched-go/impl.sh with the new version and adjust SHA256 sums as necessary.
  • Run the Internal / Release / Build and Publish Patched Go build configuration in TeamCity with your latest version of the script above. This will print out the new URL's and SHA256 sums for the patched Go that you built above.
  • Bump the version in WORKSPACE under go_download_sdk. You may need to bump rules_go. Also edit the filenames listed in sdks and update all the hashes to match what you built in the step above.
  • Run ./dev generate bazel to refresh distdir_files.bzl, then bazel fetch @distdir//:archives to ensure you've updated all hashes to the correct value.
  • Bump the version in builder.sh accordingly (source).
  • Bump the version in go-version-check.sh (source), unless bumping to a new patch release.
  • Bump the go version in go.mod.
  • Bump the default installed version of Go in bootstrap-debian.sh (source).
  • Replace other mentions of the older version of go (grep for golang:<old_version> and go<old_version>).
  • Update the builder.dockerImage parameter in the TeamCity Cockroach and Internal projects.
  • Ask the Developer Infrastructure team to deploy new TeamCity agent images according to packer/README.md

Epic: None

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajwerner ajwerner force-pushed the ajwerner/upgrade-go-version branch from e2a302a to f38ceda Compare December 19, 2022 14:56
@ajwerner ajwerner marked this pull request as ready for review December 19, 2022 14:57
@ajwerner ajwerner requested a review from a team as a code owner December 19, 2022 14:57
@ajwerner
Copy link
Contributor Author

We probably ought to backport this.

@ajwerner
Copy link
Contributor Author

This also picked up a run of buildifier on WORKSPACE.

@ajwerner ajwerner force-pushed the ajwerner/upgrade-go-version branch from f38ceda to 24c20e1 Compare December 19, 2022 15:12
@rickystewart
Copy link
Collaborator

Can you follow the directions for upgrading Go versions in build/README.md? And include a copy of the checklist in your PR description/commit message.

@ajwerner ajwerner force-pushed the ajwerner/upgrade-go-version branch from 24c20e1 to f5d21f5 Compare December 19, 2022 16:39
This upgrade picks up compiler fixes, in particular related to generic data
structures. It also picks up security fixes.

Release note: None
@ajwerner ajwerner force-pushed the ajwerner/upgrade-go-version branch from f5d21f5 to ce39332 Compare December 19, 2022 18:01
@ajwerner ajwerner requested a review from a team as a code owner December 19, 2022 18:01
@ajwerner ajwerner requested review from herkolategan and smg260 and removed request for a team December 19, 2022 18:01
@ajwerner
Copy link
Contributor Author

@rickystewart I'll leave the last two steps for this to get an LGTM. I think it's ready.

@ajwerner
Copy link
Contributor Author

As far as I can tell, for pebble, we just list the major version in CI.

@ajwerner
Copy link
Contributor Author

bors r+

@craig
Copy link
Contributor

craig bot commented Dec 19, 2022

Build succeeded:

@craig craig bot merged commit 91fbbad into cockroachdb:master Dec 19, 2022
@knz
Copy link
Contributor

knz commented Dec 27, 2022

don't we want this in 22.2 too?

@rickystewart
Copy link
Collaborator

blathers backport 22.2

@blathers-crl
Copy link

blathers-crl bot commented Jan 3, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from ce39332 to blathers/backport-release-22.2-93852: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants