Skip to content

Update submodules for 1.16.0-rc1 release#17626

Merged
zalimeni merged 1 commit into
release/1.16.xfrom
release-1.16.0-rc1-submodule-updates
Jun 8, 2023
Merged

Update submodules for 1.16.0-rc1 release#17626
zalimeni merged 1 commit into
release/1.16.xfrom
release-1.16.0-rc1-submodule-updates

Conversation

@zalimeni
Copy link
Copy Markdown
Member

@zalimeni zalimeni commented Jun 8, 2023

Description

Updating submodules, solely on the running release branch, as this is the only branch that should consume the RC submodule tags.

@zalimeni zalimeni added the pr/do-not-merge PR cannot be merged in its current form. label Jun 8, 2023
@github-actions github-actions Bot added the pr/dependencies PR specifically updates dependencies of project label Jun 8, 2023
@zalimeni zalimeni force-pushed the release-1.16.0-rc1-submodule-updates branch from f3e0669 to f4a9bad Compare June 8, 2023 21:49
@zalimeni zalimeni changed the title [DONOTMERGE] Update submodules following 1.16.x release Update submodules for 1.16.0-rc1 release Jun 8, 2023
@zalimeni zalimeni marked this pull request as ready for review June 8, 2023 22:13
@zalimeni zalimeni requested a review from nathancoleman June 8, 2023 22:13
@zalimeni zalimeni added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-metrics-test pr/no-docs PR does not include docs and should not trigger reminder for cherrypicking them. and removed pr/do-not-merge PR cannot be merged in its current form. labels Jun 8, 2023
@zalimeni zalimeni force-pushed the release-1.16.0-rc1-submodule-updates branch from f4a9bad to a4c5c22 Compare June 8, 2023 22:15
Update to new RC submodule versions. These will be updated again for the
1.16.0 release.
@zalimeni zalimeni force-pushed the release-1.16.0-rc1-submodule-updates branch from a4c5c22 to 11cfb05 Compare June 8, 2023 22:23
Copy link
Copy Markdown
Member

@nathancoleman nathancoleman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ran through the same process on my machine over Zoom. LGTM

Notably, some Consul releases have left the replace directives commented out and some have not. It seems to me that leaving them commented out is the "right" call so that the versions of the submodules being used by consul are those pinned in go.mod instead of the local directories; otherwise, there's no point to pinning the submodules in /go.mod at all because the code from the local directories will be used instead.

@zalimeni
Copy link
Copy Markdown
Member Author

zalimeni commented Jun 8, 2023

@nathancoleman I agree, I think this is a docs opportunity for future releases. I'll check that everything is happy once CI runs for these, and may re-cut the tags tomorrow to comment out replace in them too, for consistency.

@zalimeni zalimeni merged commit caad52f into release/1.16.x Jun 8, 2023
@zalimeni zalimeni deleted the release-1.16.0-rc1-submodule-updates branch June 8, 2023 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/dependencies PR specifically updates dependencies of project pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry pr/no-docs PR does not include docs and should not trigger reminder for cherrypicking them. pr/no-metrics-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants