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

Try to fix release instructions, again #169

Merged
merged 1 commit into from
Jan 22, 2024

Conversation

brandur
Copy link
Contributor

@brandur brandur commented Jan 22, 2024

Unfortunately, the release instructions are still wrong. When running
update-submodule-versions changes are made to local go.mod files,
which need to be pushed and reviewed in a pull request because of the
repo's branch protection.

Here, try to fix the release instructions by wrapping up the updates to
CHANGELOG.md and the go.mod files into one step, and move it a
little further down the instruction list to make that possible.

Unfortunately, the release instructions are still wrong. When running
`update-submodule-versions` changes are made to local `go.mod` files,
which need to be pushed and reviewed in a pull request because of the
repo's branch protection.

Here, try to fix the release instructions by wrapping up the updates to
`CHANGELOG.md` and the `go.mod` files into one step, and move it a
little further down the instruction list to make that possible.
@brandur brandur requested a review from bgentry January 22, 2024 00:14
@brandur brandur merged commit 48692cc into master Jan 22, 2024
7 checks passed
@brandur brandur deleted the brandur-fix-release-instructions-2 branch January 22, 2024 15:52
brandur added a commit that referenced this pull request Jan 22, 2024
Here, as proposed by the new release instructions in #169, tee up some
changes for 0.0.17, updating `CHANGELOG.md` with the new section and
modifying `go.mod` files to point to the new release.

Unfortunate note no. 1: the `go.mod` files change from 0.0.15 to 0.0.17
instead of starting at 0.0.16 because I accidentally botched the last
release by not pushing the `go.mod` changes. Hopefully this new process
will correct that so it doesn't happen again.

Unfortunate note no. 2: As noted in #169, we expect the build to fail
here because `go.mod` files point to a version that doesn't have a tag
yet.

The new `river validate` is included here (#170) so I'm also going to
try a two-phase release by tagging all submodules except for
`./cmd/river` with 0.0.17 first, then modifying that submodule to point
to the new 0.0.17 in other modules, then do a cut and release for it
separately. Kind of a pain, but as discussed at length before, this
seems to be the least bad of a bunch of suboptimal options.
brandur added a commit that referenced this pull request Jan 23, 2024
Here, as proposed by the new release instructions in #169, tee up some
changes for 0.0.17, updating `CHANGELOG.md` with the new section and
modifying `go.mod` files to point to the new release.

Unfortunate note no. 1: the `go.mod` files change from 0.0.15 to 0.0.17
instead of starting at 0.0.16 because I accidentally botched the last
release by not pushing the `go.mod` changes. Hopefully this new process
will correct that so it doesn't happen again.

Unfortunate note no. 2: As noted in #169, we expect the build to fail
here because `go.mod` files point to a version that doesn't have a tag
yet.

The new `river validate` is included here (#170) so I'm also going to
try a two-phase release by tagging all submodules except for
`./cmd/river` with 0.0.17 first, then modifying that submodule to point
to the new 0.0.17 in other modules, then do a cut and release for it
separately. Kind of a pain, but as discussed at length before, this
seems to be the least bad of a bunch of suboptimal options.
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