From 13387d86d0a2057a6a570a7b8c564a4a46a1b309 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Sat, 1 Feb 2025 05:28:00 -0600 Subject: [PATCH 1/2] feat: update webservices infra --- docs/maintainer/infrastructure.md | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/docs/maintainer/infrastructure.md b/docs/maintainer/infrastructure.md index fe4332cc54..06df9e8f85 100644 --- a/docs/maintainer/infrastructure.md +++ b/docs/maintainer/infrastructure.md @@ -440,12 +440,14 @@ via a pull request. We use GitHub actions to rerender feedstocks and also run our pull request automerge service. We do not currently support builds on GitHub Actions. -#### Automerge +#### Webservices Rerendering, Version Updates, and Automerge -The automerge service uses the GitHub action in this [repo](https://github.com/conda-forge/automerge-action). This action runs out of a -Docker [container](https://hub.docker.com/repository/docker/condaforge/automerge-action) on the `prod` tag. See the -repo [README.md](https://github.com/conda-forge/automerge-action#) for more details. PRs are automatically merged if they satisfy either -of the two following sets of conditions: +The webservices Heroku app uses GitHub Actions to run compute-intensive background jobs, including rerendering, version updates, +and automerge jobs. The GitHub actions runs happen on the [conda-forge-webservices repo](https://github.com/conda-forge/conda-forge-webservices). +These runs use the [webservices-dispatch-action Docker container](https://hub.docker.com/r/condaforge/webservices-dispatch-action) for some +operations. This container is tagged with the latest webservices version. + +PRs are automatically merged if they satisfy either of the two following sets of conditions: 1. are from the `regro-cf-autotick-bot`, have `[bot-automerge]` in the title, all statuses are passing, and the feedstock allows automerge 2. have the `automerge` label and all statuses are passing. @@ -453,12 +455,6 @@ of the two following sets of conditions: For PRs from the `regro-cf-autotick-bot`, it can be useful to remove the `[bot-automerge]` slug from the PR title if you are making edits to the PR. -#### Rerendering - -The rerendering service is triggered by the Heroku app. It uses the GitHub action in this [repo](https://github.com/conda-forge/webservices-dispatch-action). -This action runs out of a Docker [container](https://hub.docker.com/repository/docker/condaforge/webservices-dispatch-action) on the `prod` tag. See the -repo [README.md](https://github.com/conda-forge/webservices-dispatch-action) for more details. - ### Skipping CI builds To skip a CI build for a given commit, put `[ci skip] ***NO_CI***` in the commit message. From ecc1cf2d8f7fdee8f18aa95cbcefcd52ea9b0fe5 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Sat, 1 Feb 2025 05:35:26 -0600 Subject: [PATCH 2/2] Update infrastructure documentation for background jobs --- docs/maintainer/infrastructure.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/maintainer/infrastructure.md b/docs/maintainer/infrastructure.md index 06df9e8f85..8b390957a1 100644 --- a/docs/maintainer/infrastructure.md +++ b/docs/maintainer/infrastructure.md @@ -440,13 +440,17 @@ via a pull request. We use GitHub actions to rerender feedstocks and also run our pull request automerge service. We do not currently support builds on GitHub Actions. -#### Webservices Rerendering, Version Updates, and Automerge +#### Webservices Background Jobs -The webservices Heroku app uses GitHub Actions to run compute-intensive background jobs, including rerendering, version updates, +The webservices Heroku app dispatches to GitHub Actions to run compute-intensive background jobs, including rerendering, version updates, and automerge jobs. The GitHub actions runs happen on the [conda-forge-webservices repo](https://github.com/conda-forge/conda-forge-webservices). These runs use the [webservices-dispatch-action Docker container](https://hub.docker.com/r/condaforge/webservices-dispatch-action) for some operations. This container is tagged with the latest webservices version. +#### Automerge + +Our automerge service runs via GitHub Actions in the [conda-forge-webservices repo](https://github.com/conda-forge/conda-forge-webservices). + PRs are automatically merged if they satisfy either of the two following sets of conditions: 1. are from the `regro-cf-autotick-bot`, have `[bot-automerge]` in the title, all statuses are passing, and the feedstock allows automerge