Skip to content

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

Merged
merged 10 commits into from
Mar 16, 2021

Conversation

freddyaboulton
Copy link
Contributor

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 the master 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.

@codecov
Copy link

codecov bot commented Mar 15, 2021

Codecov Report

Merging #1979 (f3c6b90) into main (23ced7f) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 23ced7f...f3c6b90. Read the comment docs.

@@ -166,4 +166,4 @@ workflows:
- shellcheck/check
filters:
branches:
only: main
only: conda-ci-use-working-changes-branch
Copy link
Contributor Author

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!

Copy link
Contributor

@angela97lin angela97lin left a 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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo :p (beffore)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix hehe 🙈

@freddyaboulton freddyaboulton force-pushed the conda-ci-use-working-changes-branch branch from 270fa69 to 02ae842 Compare March 15, 2021 19:05
Copy link
Contributor

@bchen1116 bchen1116 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Copy link
Contributor

@bchen1116 bchen1116 left a 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 🤦🏻‍♂️

Copy link
Contributor

@chukarsten chukarsten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks solid

@freddyaboulton freddyaboulton force-pushed the conda-ci-use-working-changes-branch branch from 39ad1ec to f3c6b90 Compare March 16, 2021 19:22
@freddyaboulton freddyaboulton merged commit 11d1cff into main Mar 16, 2021
@freddyaboulton freddyaboulton deleted the conda-ci-use-working-changes-branch branch March 16, 2021 20:06
@dsherry dsherry mentioned this pull request Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants