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

feat: merge latest v0.4 to master #1499

Merged
merged 7 commits into from
May 13, 2020
Merged

feat: merge latest v0.4 to master #1499

merged 7 commits into from
May 13, 2020

Conversation

unnawut
Copy link
Contributor

@unnawut unnawut commented May 5, 2020

Overview

Merging v0.4.7 changes back to master to keep code branching to the minimum.

Changes

  • Changelog for v0.4.7
  • Sentry logging fix
  • Fix for failing CI's lint_version job

Testing

N/A

@unnawut unnawut requested review from achiurizo and InoMurko May 5, 2020 09:53
@unnawut unnawut self-assigned this May 5, 2020
@unnawut unnawut changed the title Merge v0.4.7 to master Merge latest v0.4 to master May 5, 2020
@unnawut unnawut changed the title Merge latest v0.4 to master feat: merge latest v0.4 to master May 5, 2020
@unnawut unnawut marked this pull request as draft May 5, 2020 09:54
@coveralls
Copy link

coveralls commented May 7, 2020

Coverage Status

Coverage remained the same at 78.146% when pulling 31796a7 on v0.4 into 40616b4 on master.

@unnawut unnawut marked this pull request as ready for review May 7, 2020 09:47
@kasima
Copy link
Contributor

kasima commented May 12, 2020

Tried to work through merging this PR with @unnawut.

Because v0.4 is a protected branch, we couldn't update the branch by merging up from master because master didn't have the same checks passed (we think). We turned off the required checks for this branch just to do the merge up from master.

In the normal course of development with a long-running release branch, we wouldn't want to merge up from master, since we're trying to keep these changes isolated from master. This is doesn't apply here since we don't want to keep a long-running version branch for v0.4.x. However, we still want to keep the long-running version branches for v0.1, v0.2, and v0.3 protected for now.

To merge the changes from the long-running release branch into master next time, the process would look something like:

  • git checkout v0.4
  • git checkout -b merge-0.4.7-changes-to-master
  • create a PR from merge-0.4.7-changes-to-master
    • this branch is not branch protected and allows merges from master
    • this keeps the release branch isolated

We may want to revisit the branch protection rules if we're committed to creating release branches from tags rather than using long-running branches. We could let go of the older long-running release branches.

@unnawut
Copy link
Contributor Author

unnawut commented May 12, 2020

Another thing is, the previous release I did a squash merge, and we lost all the useful commits info and ended up with a blanket "Merge v0.4 to master" commit.

This time around I'd like to try the default merge to retain the commits

@unnawut unnawut merged commit a3caa1b into master May 13, 2020
@unnawut unnawut deleted the v0.4 branch May 19, 2020 04:37
@unnawut unnawut added the chore Technical work that does not affect service behaviour label Aug 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Technical work that does not affect service behaviour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants