diff --git a/README.md b/README.md index cb1cecb62..3ae2192c7 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,10 @@ submit a PR adding your feedstock name to a new `.yml` file in `requests` folder Available opt-in resources: -- Travis CI: See `examples/example-travis.yml` -- Cirrus Runners: See `examples/example-cirrus-runners.yml` -- Cirun: Provides integration with selected cloud providers. Check the [`conda-forge/.cirun`](https://github.com/conda-forge/.cirun) repository for more details. +- Travis CI (`action: travis`): See `examples/example-travis.yml` +- [Self-hosted runners for Github Actions](https://conda-forge.org/docs/how-to/advanced/self-hosted-runners/), provided by: + - Cirrus Runners (`action: cirrus_runners`). See `examples/example-cirrus-runners.yml`. Available runners are documented in [cirrus-runners.app> Setup> Resource classes](https://cirrus-runners.app/setup/#resource-classes). Only Linux x86 for now (e.g. `ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md`). + - Cirun (`action: cirun`): Provides integration with selected cloud providers. Check the [`conda-forge/.cirun`](https://github.com/conda-forge/.cirun) repository for more details. ## Request a CFEP-3 copy to conda-forge diff --git a/conda_forge_admin_requests/__init__.py b/conda_forge_admin_requests/__init__.py index 69951d3df..87b983338 100644 --- a/conda_forge_admin_requests/__init__.py +++ b/conda_forge_admin_requests/__init__.py @@ -33,6 +33,7 @@ def register_actions(): register_action("token_reset", token_reset) register_action("travis", access_control) register_action("cirun", access_control) + register_action("cirrus_runners", access_control) register_action("cfep3_copy", cfep3_copy) register_action("add_feedstock_output", feedstock_outputs) for pkg in pkgutil.iter_modules(): diff --git a/conda_forge_admin_requests/access_control.py b/conda_forge_admin_requests/access_control.py index 4be66279c..42d015546 100644 --- a/conda_forge_admin_requests/access_control.py +++ b/conda_forge_admin_requests/access_control.py @@ -163,7 +163,7 @@ def _process_request_for_feedstock( if action == "travis": register_ci_cmd.append("--with-travis") - elif action == "cirrus-runners": + elif action == "cirrus_runners": register_ci_cmd.append("--with-cirrus-runners") if revoke: register_ci_cmd.append("--remove") @@ -197,7 +197,7 @@ def _process_request_for_feedstock( if not revoke: if action == "travis": with_cmd = "--with-travis" - elif action in ("cirun", "cirrus-runners"): + elif action in ("cirun", "cirrus_runners"): with_cmd = "--with-github-actions" print("Generating a new feedstock token") @@ -282,7 +282,7 @@ def check(request: Dict[str, Any]) -> None: check_if_repo_exists(feedstock) action = request["action"] - assert action in ("travis", "cirun", "cirrus-runners"), f"Unknown action {action}" + assert action in ("travis", "cirun", "cirrus_runners"), f"Unknown action {action}" if action == "cirun": assert "resources" in request, "No resources field in request" diff --git a/examples/example-cirrus-runners.yml b/examples/example-cirrus-runners.yml index 26acfb002..afe0be33e 100644 --- a/examples/example-cirrus-runners.yml +++ b/examples/example-cirrus-runners.yml @@ -1,4 +1,4 @@ -action: cirrus-runners +action: cirrus_runners feedstocks: # list of feedstock names (sans `-feedstock` suffix) - pytorch-cpu diff --git a/examples/example-open-gpu-server.yml b/examples/example-cirun.yml similarity index 80% rename from examples/example-open-gpu-server.yml rename to examples/example-cirun.yml index 22a63500a..d682eb3f0 100644 --- a/examples/example-open-gpu-server.yml +++ b/examples/example-cirun.yml @@ -5,11 +5,10 @@ feedstocks: resources: # list of resource names you are applying to # see https://github.com/conda-forge/.cirun for available options - - cirun-openstack-gpu-large - # - cirun-openstack-cpu-large + - cirun-azure-windows-2xlarge # switch to true if you need it on pull-requests too pull_request: false -# revoke access to the gpu runner +# revoke access to the cirun runner revoke: false # Send an automatic PR to the feedstock to enable cirun defaults send_pr: true diff --git a/requests/enable-cirrus.yml b/requests/enable-cirrus.yml new file mode 100644 index 000000000..4bfad3cab --- /dev/null +++ b/requests/enable-cirrus.yml @@ -0,0 +1,26 @@ +action: cirrus_runners +feedstocks: + # list of feedstock names (sans `-feedstock` suffix) + - astra-toolbox + - cutlass + - flash-attn + - jaxlib + - libmagma + - mongodb + - muscat-split + - nodejs + - onnxruntime + - pytorch-cpu + - pytorch_scatter + - qt-webengine + - ray-packages + - tensorflow + - tinygrad + - torchao + - viskores + - vllm + - vtk-m + - webkit2gtk4.1 + - xformers +# revoke access to the runners +revoke: false