Stop CI from clobbering commits on lockfile updates #4157
Merged
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
bjlittle
approved these changes
Jun 1, 2021
|
@jamesp Awesome stuff. I ❤️ it! |
tkknight
added a commit
to tkknight/iris
that referenced
this pull request
Jun 4, 2021
* master: refactor setup.py to setup.cfg (SciTools#4168) update docs pypi release (SciTools#4173) Update CI environment lockfiles (SciTools#4137) update CONTRIBUTING.md (SciTools#4165) RTD support link update (SciTools#4166) drop py36 support (SciTools#4163) github issues contact link for discussions (SciTools#4164) Bump black version (SciTools#4162) Stop CI from clobbering commits on lockfile updates (SciTools#4157) [pre-commit.ci] pre-commit autoupdate (SciTools#4161) Add a method to return a CubeList from CubeList.copy() (SciTools#4094) Update black et al (SciTools#4155)
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.
Suggestion cannot be applied right now. Please check back later.
🚀 Pull Request
Description
Added a step to the update lockfile workflow to first check if someone has committed to the
auto-update-lockfilesbranch since last run. If so, it will abort regenerating lockfiles.This resolves #4156 (observed in #4137).
If you really want to run the workflow and potentially clobber anything on the branch, you can override this new check step by running from the actions panel and performing a manual workflow dispatch, setting the "clobber" value to YES.
Consult Iris pull request check list