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

…ForgeMasterToMain
conda-forge · Mar 6, 2022 · 276a49d · 276a49d
1 parent 20b7e8c
commit 276a49d
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
@@ -2,3 +2,6 @@ travis:
   secure:
     BINSTAR_TOKEN: 8p4Jsl2dEx5grVP2E/xpP5Bg98Pdixx1royGRuCqewBUX8iM45Gpkq1ObvNLcXuNg0IPONpImRZRZ7vNpZH4WTq61YaRioEFzglDA9h7wAOFgSaQPZ8FvwD98JfhK73nPbYHiOBHzLn/Bpjp6gkgJXsMJEOIjJnnAf/Q6krq9SuF2AzcLnAvXefvFXsx6Ac7SYWvpfElV8TTMEkI3n9nTwVffirLerohDzwg51kFCjVtTjmCEyvI+8PrsldLmVAIk0bSDQZ+NTt/wDkHXIGws9vfZHJjxeuavtmJ3F5xpIZ+S27d5EfxFqiAO5tM2xTVuJ4MQJ94AoUsHTbEIV/BUDzmqaKll8X+2FmaKe5r/7WWm5lLuyoGANo8FL6DwQMOjYSCfnJ9LFWC2SdQrdLjpmwxGZCTy12ukOxYbmMqvYXKkIfEmyyshFh35KE017YhSx+eNHsV/4IOUWSF28SssOswt6aQI/Z64/+JnqBGr28GzzHn+IldiFnyBCabyRc+pGbBE2hH6CFYJbjM14VjH3/9s3LdST2JPkXCP4e3PIszvj+5d173oFRYt6BvkdYZn7rJ5+yDUxLVRtFfq27h4Z8VaGD/KMjx2a9uHFYmH/DWwlbOVPrjbcq1uq4RPvGa51m+qgtswFfNfaN+hnWLYgNyJ8CUlmMaR4in1ywjvSM=
 conda_forge_output_validation: true
+github:
+  branch_name: main
+  tooling_branch_name: main