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

Make github workflow which would ensure that PR against master would have everything from maint merged #7590

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

yarikoptic
Copy link
Member

@yarikoptic yarikoptic commented May 7, 2024

I think we should retain the habit of releasing minor (or eventually next major) versions from master while patch fixes from maint (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

  • Provide an overview of the changes you're making and explain why you're proposing them.
  • Create a changelog snippet (add the 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).
  • Sophisticate workflow to trigger also on any other push to master or maint 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

@yarikoptic yarikoptic added semver-internal Changes only affect the internal API CHANGELOG-missing When a PR's description does not contain a changelog item, yet. labels May 7, 2024
@github-actions github-actions bot removed the CHANGELOG-missing When a PR's description does not contain a changelog item, yet. label May 7, 2024
@yarikoptic yarikoptic added release Create a release when this pr is merged CHANGELOG-missing When a PR's description does not contain a changelog item, yet. labels May 7, 2024
@github-actions github-actions bot removed the CHANGELOG-missing When a PR's description does not contain a changelog item, yet. label May 7, 2024
@yarikoptic
Copy link
Member Author

@yarikoptic yarikoptic removed the release Create a release when this pr is merged label May 7, 2024
@yarikoptic yarikoptic marked this pull request as ready for review May 7, 2024 15:02
changelog.d/pr-7590.md Outdated Show resolved Hide resolved
Copy link

codeclimate bot commented May 13, 2024

Code Climate has analyzed commit 5b3ec33 and detected 0 issues on this pull request.

View more on Code Climate.

@yarikoptic
Copy link
Member Author

I clarified wording in the changelog entry.
As it is just a "safe guard" for releases I think it would be ok to merge -- which I will do in a few days unless there is a push back.

Copy link

codecov bot commented May 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.67%. Comparing base (864dc4a) to head (5b3ec33).

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.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver-internal Changes only affect the internal API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant