Use SYNC_TOKEN, improve PR titles, reorder config to avoid double r…

…enders (#984) * Use SYNC_TOKEN to clone (and push) changes * Update title * Reorder PR templating to avoid double renders
conda · Aug 5, 2024 · e2a415e · e2a415e
1 parent dd05b06
commit e2a415e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/template-files/config.yml b/.github/template-files/config.yml
@@ -34,10 +34,10 @@ conda/infrastructure:
     dst: .github/ISSUE_TEMPLATE/epic.yml
 
   # [optional] standard PR template
-  - src: templates/pull_requests/base.md
-    dst: .github/PULL_REQUEST_TEMPLATE.md
   # - src: templates/pull_requests/news_tests_docs.md
   #   dst: .github/template-files/templates/pull_request_template_details.md
+  - src: templates/pull_requests/base.md
+    dst: .github/PULL_REQUEST_TEMPLATE.md
 
   # [optional] rever release files
   # - src: templates/releases/RELEASE.md

diff --git a/.github/workflows/init.yml b/.github/workflows/init.yml
@@ -66,7 +66,7 @@ jobs:
           token: ${{ secrets.SYNC_TOKEN }}
           branch: init-${{ github.event.inputs.org }}-${{ github.event.inputs.repo }}
           delete-branch: true
-          title: 🤖 Initialize infrastructure updates for ${{ github.event.inputs.org }}/${{ github.event.inputs.repo }}
+          title: 🤖 Remove ${{ github.event.inputs.org }}/${{ github.event.inputs.repo }} from `sync.yml`
           body: |
             [init.yml]: ${{ github.server_url }}/${{ github.repository }}/blob/main/.github/workflows/init.yml
 
@@ -115,7 +115,7 @@ jobs:
           token: ${{ secrets.SYNC_TOKEN }}
           branch: init
           delete-branch: true
-          title: 🤖 Init
+          title: 🤖 Init `update.yml` workflow
           body: |
             [init.yml]: ${{ github.server_url }}/${{ github.repository }}/blob/main/.github/workflows/init.yml
 

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -48,6 +48,7 @@ jobs:
         with:
           repository: ${{ env.REPOSITORY || github.repository }}
           ref: ${{ env.REF || '' }}
+          token: ${{ secrets.SYNC_TOKEN }}
 
       - name: Configure git user
         run: |

diff --git a/templates/config.yml b/templates/config.yml
@@ -34,10 +34,10 @@ conda/infrastructure:
     dst: .github/ISSUE_TEMPLATE/epic.yml
 
   # [optional] standard PR template
-  - src: templates/pull_requests/base.md
-    dst: .github/PULL_REQUEST_TEMPLATE.md
   # - src: templates/pull_requests/news_tests_docs.md
   #   dst: .github/template-files/templates/pull_request_template_details.md
+  - src: templates/pull_requests/base.md
+    dst: .github/PULL_REQUEST_TEMPLATE.md
 
   # [optional] rever release files
   # - src: templates/releases/RELEASE.md