Skip to content

[1.17] Merge from 1.16#414

Merged
dagood merged 5 commits into
microsoft:microsoft/release-branch.go1.17from
dagood:dev/dagood/merge-1.17-from-1.16
Feb 9, 2022
Merged

[1.17] Merge from 1.16#414
dagood merged 5 commits into
microsoft:microsoft/release-branch.go1.17from
dagood:dev/dagood/merge-1.17-from-1.16

Conversation

@dagood
Copy link
Copy Markdown
Member

@dagood dagood commented Feb 9, 2022

Making this PR went like this:

  • git merge from 1.16 in a dev branch.
    • One conflict: the submodule. Resolve using git reset -- go, git merge --continue.
  • Try to build locally. Patches fail to apply because the merge brought in a 1.16-specific tweak.
  • Run git go-patch apply to start the patch fixup process.
  • Inside the submodule, run git am -3 to start a three-way merge.
  • See that the three-way merge was able to take care of the problem and the am completed without any more input.
  • Run git go-patch extract to rewrite the patch file with the fixup.
    • This failed on my first attempt, because of an issue with git-go-patch. Pushed a fix (with explanation in comment): microsoft/go-infra@e19d885. Then re-ran the process from git go-patch apply.
  • Commit and push dev branch.

@dagood dagood force-pushed the dev/dagood/merge-1.17-from-1.16 branch from edc6a22 to 4a14e62 Compare February 9, 2022 18:59
@dagood dagood marked this pull request as ready for review February 9, 2022 19:06
@dagood dagood requested a review from a user February 9, 2022 19:06
@dagood dagood requested a review from a team as a code owner February 9, 2022 19:06
@dagood dagood enabled auto-merge February 9, 2022 19:14
@dagood
Copy link
Copy Markdown
Member Author

dagood commented Feb 9, 2022

microsoft-go (windows_amd64_devscript) hit a known probably-Windows-Defender flakiness issue:

go install cmd/compile: copying C:\Users\VSSADM~1\AppData\Local\Temp\go-build3890923320\b098\exe\a.out.exe: open D:\a\1\s\go\pkg\tool\windows_amd64\compile.exe: Access is denied.

Auto-retries are only implemented in the build step, not test. Filed #415 to potentially add more retrying.

I'll hit the AzDO retry button, for now. (Unfortunately, hit yet again with AzDO not allowing me to retry a failed job until all jobs in the stage have completed or been canceled.)

@dagood dagood merged commit b1e24c4 into microsoft:microsoft/release-branch.go1.17 Feb 9, 2022
@dagood dagood deleted the dev/dagood/merge-1.17-from-1.16 branch February 9, 2022 21:18
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.

2 participants