Merge remote-tracking branch 'origin/master' into feat/ref-minimizer

nextstrain · Sep 4, 2023 · 2938974 · 2938974
2 parents 27da9e9 + ae96eb6
commit 2938974
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -1,5 +1,9 @@
 on:
   push:
+    branches:
+      - master
+      - staging
+      - release
   pull_request:
   repository_dispatch:
     types: build-and-deploy
@@ -38,9 +42,33 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v3
         with:
-          fetch-depth: 50
+          fetch-depth: 0
           submodules: true
 
+      - name: "Authenticate git"
+        run: |
+          export GITHUB_TOKEN="${{ secrets.GH_TOKEN_NEXTSTRAIN_BOT_REPO }}"
+          export BOT_GIT_USER_EMAIL="${{ secrets.BOT_GIT_USER_EMAIL }}"
+          export BOT_GIT_USER_NAME="${{ secrets.BOT_GIT_USER_NAME }}"
+
+          : ${GITHUB_TOKEN?"The env var GITHUB_TOKEN is required"}
+          : ${BOT_GIT_USER_EMAIL?"The env var BOT_GIT_USER_EMAIL is required"}
+          : ${BOT_GIT_USER_NAME?"The env var BOT_GIT_USER_NAME is required"}
+
+          git config --global user.email "${BOT_GIT_USER_EMAIL}"
+          git config --global user.name "${BOT_GIT_USER_NAME}"
+
+          gh auth setup-git >/dev/null
+
+      - name: "Extract branch name"
+        run: |
+          echo "current_branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: branch-name
+
+      - name: "Checkout branch"
+        run: |
+          git checkout ${{ steps.branch-name.outputs.current_branch }}
+
       - name: "Install system dependencies"
         run: |
           sudo apt-get install brotli pigz parallel python3 rename --yes -qq >/dev/null
@@ -58,21 +86,6 @@ jobs:
           popd >/dev/null
           aws --version
 
-      - name: "Authenticate git"
-        run: |
-          export GITHUB_TOKEN="${{ secrets.GH_TOKEN_NEXTSTRAIN_BOT_REPO }}"
-          export BOT_GIT_USER_EMAIL="${{ secrets.BOT_GIT_USER_EMAIL }}"
-          export BOT_GIT_USER_NAME="${{ secrets.BOT_GIT_USER_NAME }}"
-
-          : ${GITHUB_TOKEN?"The env var GITHUB_TOKEN is required"}
-          : ${BOT_GIT_USER_EMAIL?"The env var BOT_GIT_USER_EMAIL is required"}
-          : ${BOT_GIT_USER_NAME?"The env var BOT_GIT_USER_NAME is required"}
-
-          git config --global user.email "${BOT_GIT_USER_EMAIL}"
-          git config --global user.name "${BOT_GIT_USER_NAME}"
-
-          gh auth setup-git >/dev/null
-
       - name: "Rebuild, commit and push datasets"
         if: github.ref != 'refs/heads/release'
         run: |

diff --git a/data_output/index.json b/data_output/index.json
@@ -1,6 +1,6 @@
 {
   "schemaVersion": "3.0.0",
-  "updatedAt": "2023-08-31T11:28:52Z",
+  "updatedAt": "2023-09-01T20:39:16Z",
   "collections": [
     {
       "meta": {

diff --git a/scripts/rebuild_v3 b/scripts/rebuild_v3
@@ -321,7 +321,7 @@ def aggregate_release_notes(release_infos):
 def commit_changes(args, tag, release_infos):
   l.info(f"Commiting changes for '{tag}'")
 
-  commit_message = "chore: rebuild"
+  commit_message = "chore: rebuild [skip ci]"
   if args.release:
     dataset_names = format_list(
       unique([get_dataset_name(release_info["dataset"]) for release_info in release_infos]),