-
Notifications
You must be signed in to change notification settings - Fork 111
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
Make github workflow which would ensure that PR against master would have everything from maint merged #7590
base: master
Are you sure you want to change the base?
Conversation
…have everything from maint merged
ok, seems good. Let me merge now |
Code Climate has analyzed commit 5b3ec33 and detected 0 issues on this pull request. View more on Code Climate. |
I clarified wording in the changelog entry. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #7590 +/- ##
==========================================
- Coverage 91.35% 90.67% -0.68%
==========================================
Files 325 325
Lines 43442 43438 -4
Branches 5778 0 -5778
==========================================
- Hits 39685 39389 -296
- Misses 3741 4049 +308
+ Partials 16 0 -16 ☔ View full report in Codecov by Sentry. |
I think we should retain the habit of releasing minor (or eventually next major) versions from
master
while patch fixes frommaint
(we might even keep releasing patch fixes for the prior minor I guess... but probably we shouldn't).This way we can 'stage' for next minor release while releasing patch releases without bottleneck/force to release miors.
With this PR I want to make sure that when we do release next minor, we do include all fixes from
maint
.As only pertinent to master branch -- I positioned it against master. Also would make it easier to check
PR checklist
CHANGELOG-missing
label to this pull request in order to have a snippet generated from its title;or use
scriv create
locally and include the generated file in the pull request, see scriv).master
ormaint
so it stays "up to date" even if no changes to PR happen -- decided to postpone for later... would need more work.edit: I canceled appveyor since unrelated