Skip to content

Commit

Permalink
clean up bulk cli
Browse files Browse the repository at this point in the history
bulk ci only runs if `[ci run]` in the commit message, so by default
builds are skipped
  • Loading branch information
daler committed Dec 3, 2023
1 parent 7f09fc6 commit a4578ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion bioconda_utils/bulk.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
def check_branch():
branch = utils.run(["git", "rev-parse", "--abbrev-ref", "HEAD"], mask=False).stdout
if branch != "bulk":
logger.error("bulk-run-ci has to be executed on a checkout of the bulk branch")
logger.error("bulk-trigger-ci has to be executed on a checkout of the bulk branch")
exit(1)


Expand Down
14 changes: 5 additions & 9 deletions bioconda_utils/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -1093,15 +1093,11 @@ def list_build_failures(recipe_folder, config, channel=None, output_format=None,
fmt_writer(df, sys.stdout, index=False)


@arg(
'message',
help="The commit message. Will be prepended with [ci skip] to avoid that commits accidentally trigger a rerun while bulk is already running"
)
def bulk_commit(message):
bulk.commit(message)


def bulk_trigger_ci():
"""
Create an empty commit with the string "[ci run]" and push, which
triggers a bulk CI run. Must be on the `bulk` branch.
"""
bulk.trigger_ci()


Expand All @@ -1113,5 +1109,5 @@ def main():
build, dag, dependent, do_lint, duplicates, update_pinning,
bioconductor_skeleton, clean_cran_skeleton, autobump,
handle_merged_pr, annotate_build_failures, list_build_failures,
bulk_commit, bulk_trigger_ci
bulk_trigger_ci
])

0 comments on commit a4578ed

Please sign in to comment.