From 18d41142a757522eb291614d937c46a67be084c7 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 13 Mar 2022 19:24:41 +0000 Subject: [PATCH] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeMasterToMain --- .github/workflows/automerge.yml | 2 +- .github/workflows/webservices.yml | 2 +- conda-forge.yml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f79fe856..773b3d12 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: automerge-action id: automerge-action - uses: conda-forge/automerge-action@master + uses: conda-forge/automerge-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml index 2e5fe71f..d6f06b5c 100644 --- a/.github/workflows/webservices.yml +++ b/.github/workflows/webservices.yml @@ -7,7 +7,7 @@ jobs: steps: - name: webservices id: webservices - uses: conda-forge/webservices-dispatch-action@master + uses: conda-forge/webservices-dispatch-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/conda-forge.yml b/conda-forge.yml index aeec0467..9f2e05f5 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,3 +8,6 @@ provider: linux_aarch64: default linux_ppc64le: azure test_on_native_only: true +github: + branch_name: main + tooling_branch_name: main