[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…

…ForgeMasterToMain
conda-forge · Mar 14, 2022 · c3c6ff3 · c3c6ff3
1 parent c645693
commit c3c6ff3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,2 +1,5 @@
 provider: {linux_aarch64: azure, linux_ppc64le: azure, win: azure}
 conda_forge_output_validation: true
+github:
+  branch_name: main
+  tooling_branch_name: main