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

Jump to bottom

all: reopen tree for Go 1.17 development #44222

Closed
7 tasks done
dmitshur opened this issue Feb 11, 2021 · 23 comments
Closed
7 tasks done

all: reopen tree for Go 1.17 development #44222

dmitshur opened this issue Feb 11, 2021 · 23 comments
Labels
Builders x/build issues (builders, bots, dashboards) early-in-cycle A change that should be done early in the 3 month dev cycle. FrozenDueToAge NeedsFix The path to resolution is known, but the work has not been done. umbrella
Projects
Go Release Team
Milestone
Go1.17

Comments

@dmitshur
Copy link
Contributor

dmitshur commented Feb 11, 2021 •
edited

Current Tree Status: Open for Go 1.17 development (see golang-dev announcement)

As we're getting closer to the final Go 1.16 release, we will soon need to open the tree for Go 1.17 development.

As usual, the tree will initially be open to changes that must land early. Tentatively:

We will send status updates to golang-dev@ as part of this work.

This is the tracking issue for completing this task.

CC @golang/release, @ianlancetaylor.
@dmitshur dmitshur added NeedsFix The path to resolution is known, but the work has not been done. early-in-cycle A change that should be done early in the 3 month dev cycle. labels Feb 11, 2021
@dmitshur dmitshur added this to the Go1.17 milestone Feb 11, 2021
@gopherbot gopherbot added the Builders x/build issues (builders, bots, dashboards) label Feb 11, 2021
@dmitshur dmitshur added this to Planned in Go Release Team Feb 11, 2021
@dmitshur
Copy link
Contributor Author

It's planned by @golang/release for this issue to begin progressing after the Go 1.16 release is issued.

@dmitshur dmitshur self-assigned this Feb 16, 2021
@dmitshur
Copy link
Contributor Author

The "Current Tree Status" was just changed from "Frozen for Go 1.16 changes only" to "Accepting early Go 1.17 changes only (see list below)". I've sent a message to golang-dev.

I'll work with @bcmills on the first CL on the list.

@bcmills
Copy link
Contributor

bcmills commented Feb 16, 2021

internal/goversion is in. Time to merge some branches (@cherrymui, @jeremyfaller)?

@dmitshur dmitshur mentioned this issue Feb 16, 2021
Closed
@dmitshur dmitshur moved this from Planned to In Progress in Go Release Team Feb 16, 2021
@gopherbot
Copy link

Change https://golang.org/cl/292709 mentions this issue: all: merge branch dev.regabi (d3cd4830ad) into master

gopherbot pushed a commit that referenced this issue Feb 16, 2021
@cherrymui
all: merge branch dev.regabi (d3cd483) into master
8482559 
This CL merges the dev.regabi branch to the master branch.

In the dev.regabi branch we have refactored the compiler, and laid
some preliminary work for enabling a register-based ABI (issue #40724),
including improved late call/return lowering, improved ABI wrapper
generation, reflect call prepared for the new ABI, and reserving
special registers in the internal ABI. The actual register-based ABI
has not been enabled for the moment. The ABI-related changes are behind
GOEXPERIMENT=regabi and currently off by default.

Updates #40724, #44222.
Fixes #44224.

Change-Id: Id5de9f734d14099267ab717167aaaeef31fdba70
@dmitshur
Copy link
Contributor Author

Merging dev.regabi into master (issue #44224) was resolved (thank you @cherrymui). The next item currently in the list is:

When it's done (or if plans change), please update this issue and coordinate with the people working on the next item. Thank you!

@griesemer
Copy link
Contributor

Quick update. Merging the dev.typeparams branch will require 1) to merge master into dev.typeparams (today), 2) isolating API changes that we may need for 1.18 but not for 1.17 (next couple of days), and then 3) merging dev.typeparams into master (hopefully by end of this week).

@rsc rsc changed the title x/build: reopen tree for Go 1.17 development all: reopen tree for Go 1.17 development Feb 18, 2021
@rsc
Copy link
Contributor

rsc commented Feb 18, 2021

While we wait for dev.typeparams, it is OK for the cmd/go changes to proceed - I just checked and there are no changes in cmd/go on dev.typeparams.

@rsc
Copy link
Contributor

rsc commented Feb 18, 2021

It also looks OK for the windows/arm64 changes to proceed - there is no overlap except for one if statement in cmd/compile deciding about whether arm64 frame pointers are enabled, and dev.typeparams won't be changing that.

@bcmills
Copy link
Contributor

bcmills commented Feb 19, 2021

The cmd/go changes that were ready to merge are in — we're all clear there from the perspective of opening the tree.

@griesemer
Copy link
Contributor

Status update on dev.typeparams:

  • we've done a recent (this afternoon) merge from master, so dev.typeparams is tracking master closely
  • all outstanding CLs are in
  • the build looks green but for (now) linux-ppc64le-power9osu (API check killed)

Currently we are trying to get x/tools tests to pass: They rely on go/parser and go/types which have changed significantly. We have fixed several failures and should be down to one or two at the most by tonight. Once x/tools passes, we can merge once more with master (should be clean) and then dev.typeparams can be merged into master. Maybe tomorrow, and hopefully before Monday.

@griesemer
Copy link
Contributor

Status update on dev.typeparams:

  • build looks green but for linux-ppc64le-power9osu (API check killed) and netbsd-argm64-bsiegert (intermittent failure)
  • x/tools seems to be ok but for x/tools/internal/lsp/source (but I may not have the correct setup, @findleyr will know more)

Once the lsp tests are deemed ok we should be ready to go. Next steps:

  • merge master -> dev.typeparams (expected to be trivial and conflict free)
  • merge dev.typeparams -> master

@rsc
Copy link
Contributor

rsc commented Feb 19, 2021 •
edited

I merged the windows/arm64 changes last night and broke a few builders. I have CLs out for those.
(https://go-review.googlesource.com/c/go/+/294072/1 and below.)
We should probably wait to get those fixed before doing the dev.typeparams merge, but they should be fixed soon.

@thanm
Copy link
Contributor

thanm commented Feb 19, 2021

@dmitshur FYI, Russ has asked me to do an early submit https://go-review.googlesource.com/c/go/+/293309 with the fix for https://golang.org/issue/44344. Hope that is ok.

@ianlancetaylor
Copy link
Contributor

I think the guidelines should be that pure bug fixes are OK at any time.

@dmitshur
Copy link
Contributor Author

@thanm Yes, as Russ said that CL is a follow up to the dev.regabi merge and is okay. Thanks.

@findleyr
Copy link
Contributor

Status update on dev.typeparams:

x/tools should now be green. I tested the merge in https://golang.org/cl/293770, and all Trybots succeeded (including x/tools). To be extra careful I'll also run x/tools tests on various other builders using gomote, though I'm not actually aware of changes in dev.typeparams that would cause failures on specific builders.

@rsc
Copy link
Contributor

rsc commented Feb 19, 2021 •
edited

@findleyr and @griesemer are going to work on the dev.typeparams -> master merge in about an hour.
Consider the tree locked until they are done.

(The tooling requires that no commits appear on master between the preparatory master -> dev.typeparams merge and the final dev.typeparams -> master merge, so we can help them avoid doing multiple of the first merge by not submitting anything.)

Thanks!

@griesemer
Copy link
Contributor

dev.typeparams has been merged into master.
(Perhaps give it 30min or so to settle on the build dashboard for a clear picture.)

@rsc
Copy link
Contributor

rsc commented Feb 19, 2021

dev.typeparams is merged.
I still have some pieces to pick up from windows/arm64, and I need to send in the //go:build CLs.
So we're not open for business yet.
But hopefully soon.
Watch this space.

@rsc
Copy link
Contributor

rsc commented Feb 20, 2021

If any +2'ers want to help move things along, once these reformatting CLs are in I think we can soft-open the tree.
https://go-review.googlesource.com/q/o:rsc+status:open+fmt

@rsc
Copy link
Contributor

rsc commented Feb 20, 2021

I've submitted what must be submitted before soft-reopening. I'm waiting for the dashboards to clear and will post when it is time. One more reformatting CL for anyone who wants it: https://go-review.googlesource.com/c/sys/+/294490.

@rsc
Copy link
Contributor

rsc commented Feb 20, 2021

OK, things look stable enough on the dashboard. Thanks for the reviews.

The tree is now open for bug fixes only.

This is a soft reopening for the weekend, before the full re-opening Monday.
An email to golang-dev@ will announce the full re-opening.
Again, bug fixes only for now.
No new features, new implementations, new API, etc. (Not yet.)

The compiler underwent major surgery during the freeze in preparation for generics,
and the runtime had minor surgery in preparation for the windows/arm64 port.
There is still a bug to find to revive windows/arm (32-bit), which I'll try to do in the next few days.
Everything else seems to be working decently on the dashboard.
But certainly there are bugs, and help finding and fixing them is always appreciated. :-)

Happy hacking!

@dmitshur
Copy link
Contributor Author

The "Current Tree Status" was updated from "Open for bug fixes only" to "Open for Go 1.17 development". I've sent an announcement to golang-dev.

Closing, as this issue is resolved. Thanks everyone!

Go Release Team automation moved this from In Progress to Done Feb 22, 2021
@jeremyfaller jeremyfaller mentioned this issue Feb 23, 2021
Open
@golang golang deleted a comment from Budda0ne Mar 7, 2021
@mewmew mewmew mentioned this issue Mar 15, 2021
Open
@golang golang locked and limited conversation to collaborators Mar 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
Builders x/build issues (builders, bots, dashboards) early-in-cycle A change that should be done early in the 3 month dev cycle. FrozenDueToAge NeedsFix The path to resolution is known, but the work has not been done. umbrella
Projects
Go Release
Archived in project
Go Release Team
Done
Milestone
Go1.17
Development

No branches or pull requests
8 participants
@rsc @dmitshur @ianlancetaylor @bcmills @griesemer @gopherbot @thanm @findleyr