ci: commits from bot, show branch in check script (#5428)

Author: domoritz

.github/workflows/check.yml

@@ -14,6 +14,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 10
 
       - name: Install Node dependencies
         run: yarn --frozen-lockfile
@@ -40,14 +42,35 @@ jobs:
       - name: Check Schema
         run: ./scripts/check-schema.sh
 
-      - name: Setup data
-        run: yarn data
+      - name: Setup Git remote
+        run: ./scripts/setup-git-ci.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check and Commit
+        run: ./scripts/check-and-commit.sh
+
+  toc:
+    runs-on: ubuntu-latest
+
+    name: TOC
+
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 10
+
+      - name: Install Node dependencies
+        run: yarn --frozen-lockfile
 
       - name: Setup Ruby
         uses: actions/setup-ruby@v1
         with:
           ruby-version: '2.x'
 
+      - name: Setup data
+        run: yarn data
+
       - name: Build Jekyll
         run: |
           gem install bundler
@@ -59,7 +82,10 @@ jobs:
       - name: Build TOC
         run: scripts/generate-toc
 
-      - name: Check and Commit
-        run: ./scripts/check-and-commit.sh
+      - name: Setup Git remote
+        run: ./scripts/setup-git-ci.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check and Commit
+        run: ./scripts/check-and-commit-toc.sh

scripts/build-example.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 dir=${dir-"examples/compiled"}
 

scripts/build-examples.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # script for npm run x-compile
 
-set -e
+set -eo pipefail
 
 dir=${dir-"examples/compiled"}
 

scripts/bump.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 if [ "$#" -ne 1 ]; then
   echo "You must provide the new version to the script. The current version is $(./scripts/version.sh vega-lite)."

scripts/check-and-commit-toc.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
+git checkout $GIT_BRANCH
+
+echo "On branch $GIT_BRANCH."
+
+echo ""
+echo "------- Checking TOC -------"
+echo ""
+
+# Commit the TOC if outdated
+if ! git diff --exit-code ./site/_includes/docs_toc.md
+then
+  ## Only do this for master
+  if [[ $GIT_BRANCH == 'master' ]]; then
+    echo "Outdated TOC."
+    exit 1
+  else
+    git add ./site/_includes/docs_toc.md
+    git commit -m "chore: update TOC [CI]"
+
+    # Push all the TOC changes
+    git pull --rebase origin ${GITHUB_REF}
+    git push origin ${GITHUB_REF}
+  fi
+fi
+
+exit 0

scripts/check-and-commit.sh

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
-scripts/setup-git-ci.sh
+GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
+git checkout $GIT_BRANCH
 
-GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+echo "On branch $GIT_BRANCH."
 
 echo ""
 echo "------- Checking Schema -------"
@@ -23,28 +24,10 @@ then
   fi
 fi
 
-echo ""
-echo "------- Checking TOC -------"
-echo ""
-
-# Commit the TOC if outdated
-if ! git diff --exit-code ./site/_includes/docs_toc.md
-then
-  ## Only do this for master
-  if [[ $GIT_BRANCH == 'master' ]]; then
-    echo "Outdated TOC."
-    exit 1
-  else
-    git add ./site/_includes/docs_toc.md
-    git commit -m "chore: update TOC [CI]"
-  fi
-fi
-
 echo ""
 echo "------- Checking Examples -------"
 echo ""
 
-
 if git log -1 | grep "\[SVG\]" && [[ $GIT_BRANCH != 'master' ]]; then
   echo "As the latest commit includes [SVG]. Rebuilding all SVGs."
   yarn build:examples-full
@@ -72,7 +55,6 @@ else
   fi
 fi
 
-
 echo ""
 echo "------- Checking Code Formatting -------"
 echo ""
@@ -86,6 +68,7 @@ if [[ $GIT_BRANCH != 'master' ]]; then
   fi
 
   # Then push all the changes (schema, examples, prettier)
+  git pull --rebase origin ${GITHUB_REF}
   git push origin ${GITHUB_REF}
 fi
 

scripts/check-npm.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 # Check if all required files are here
 if ! [ -f build/vega-lite.js ]; then

scripts/check-schema.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 if grep 'Generic[^U].*Spec<' ./build/vega-lite-schema.json
 then

scripts/create-example-pages.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -euxo pipefail
 
 rsync -r examples/specs/* site/examples/
 rsync examples/compiled/*.svg site/examples/

scripts/deploy-schema.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 version=$(scripts/version.sh vega-lite)