Using latest_release_changes branch in build_conda_pkg job #1979
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
freddyaboulton
commented
Mar 15, 2021
.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.
Will change back to main before merge!
freddyaboulton
requested review from
dsherry,
angela97lin,
bchen1116,
chukarsten,
jeremyliweishih and
ParthivNaresh
angela97lin
approved these changes
Mar 15, 2021
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.
Will fix hehe
freddyaboulton
force-pushed
the
conda-ci-use-working-changes-branch
branch
from
270fa69
to
02ae842
Compare
bchen1116
approved these changes
Mar 15, 2021
freddyaboulton
force-pushed
the
conda-ci-use-working-changes-branch
branch
from
39ad1ec
to
f3c6b90
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
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_changesbranch. 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_changesbranch and themasterbranch 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.rstto include this pull request by adding :pr:123.