-
Notifications
You must be signed in to change notification settings - Fork 89
Using latest_release_changes branch in build_conda_pkg job #1979
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
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1979 +/- ##
=======================================
Coverage 100.0% 100.0%
=======================================
Files 273 273
Lines 22381 22381
=======================================
Hits 22375 22375
Misses 6 6 Continue to review full report at Codecov.
|
.circleci/config.yml
Outdated
@@ -166,4 +166,4 @@ workflows: | |||
- shellcheck/check | |||
filters: | |||
branches: | |||
only: main | |||
only: conda-ci-use-working-changes-branch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will change back to main before merge!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, I love this! 🚢
release.md
Outdated
After you merge the PR, our latest package will be deployed to conda-forge! To verify, run this in a fresh conda environment: | ||
You may need to make other changes to the bot's PR. For example, we sometimes add new dependencies or change the allowed | ||
versions of our existing dependencies. These changes will break our conda-forge CI, so it's important to add them to the | ||
bot's PR beffore merging. To see the changes you need to make, compare the bot's branch to the `latest_release_changes` branch. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo :p (beffore)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will fix hehe 🙈
270fa69
to
02ae842
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I forgot to hit approve 🤦🏻♂️
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks solid
39ad1ec
to
f3c6b90
Compare
Pull Request Description
We sometimes make changes to our dependencies mid-sprint that break our conda ci job. We sometimes have to do a release to fix this because our ci job builds the package based on the feedstock's main branch and each commit to main on the feedstock will make a new conda release.
Rather than run the ci job on the main branch, I propose we run against the
latest_release_changes
branch. This branch will accumulate all changes that need to be added to the recipe during the sprint. When we go to release, we'll just add these changes to the bot's PR.Since the ci on the bot PR will fail unless we make these changes, the
latest_release_changes
branch and themaster
branch will always be in synch, at least in the dependency versions.After creating the pull request: in order to pass the release_notes_updated check you will need to update the "Future Release" section of
docs/source/release_notes.rst
to include this pull request by adding :pr:123
.