From 38c2fb9ed2a3ecde1272d6694bd57795192986b9 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Sun, 26 Jan 2020 15:40:53 +0100
Subject: [PATCH] Extract deployment

---
 .github/deploy.sh            | 43 +++++++++++++++++++++++++++++++++
 .github/workflows/deploy.yml | 46 +++---------------------------------
 2 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 .github/deploy.sh

diff --git a/.github/deploy.sh b/.github/deploy.sh
new file mode 100644
index 000000000000..d96c69392a1e
--- /dev/null
+++ b/.github/deploy.sh
@@ -0,0 +1,43 @@
+#! /bin/bash
+
+set -ex
+
+echo "Removing the current docs for master"
+rm -rf out/master/ || exit 0
+
+echo "Making the docs for master"
+mkdir out/master/
+cp util/gh-pages/index.html out/master
+python ./util/export.py out/master/lints.json
+
+if [[ -n $TAG_NAME ]]; then
+  echo "Save the doc for the current tag ($TAG_NAME) and point current/ to it"
+  cp -r out/master "out/$TAG_NAME"
+  rm -f out/current
+  ln -s "$TAG_NAME" out/current
+fi
+
+# Generate version index that is shown as root index page
+cp util/gh-pages/versions.html out/index.html
+
+cd out
+cat <<-EOF | python - > versions.json
+import os, json
+print json.dumps([
+    dir for dir in os.listdir(".") if not dir.startswith(".") and os.path.isdir(dir)
+])
+EOF
+
+# Now let's go have some fun with the cloned repo
+git config user.name "GHA CI"
+git config user.email "gha@ci.invalid"
+
+if git diff --exit-code --quiet; then
+  echo "No changes to the output on this push; exiting."
+  exit 0
+fi
+
+git add .
+git commit -m "Automatic deploy to GitHub Pages: ${SHA}"
+
+git push "$SSH_REPO" "$TARGET_BRANCH"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 100adbadd5ab..322f8ca67a38 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,49 +24,9 @@ jobs:
       with:
         ref: ${{ env.TARGET_BRANCH }}
         path: 'out'
-    - name: Deploy
+    - name: Add SSH key
       run: |
-        set -ex
-
-        echo "Removing the current docs for master"
-        rm -rf out/master/ || exit 0
-
-        echo "Making the docs for master"
-        mkdir out/master/
-        cp util/gh-pages/index.html out/master
-        python ./util/export.py out/master/lints.json
-
-        if [[ -n $TAG_NAME ]]; then
-          echo "Save the doc for the current tag ($TAG_NAME) and point current/ to it"
-          cp -r out/master "out/$TAG_NAME"
-          rm -f out/current
-          ln -s "$TAG_NAME" out/current
-        fi
-
-        # Generate version index that is shown as root index page
-        cp util/gh-pages/versions.html out/index.html
-
-        cd out
-        cat <<-EOF | python - > versions.json
-        import os, json
-        print json.dumps([
-            dir for dir in os.listdir(".") if not dir.startswith(".") and os.path.isdir(dir)
-        ])
-        EOF
-
-        # Now let's go have some fun with the cloned repo
-        git config user.name "GHA CI"
-        git config user.email "gha@ci.invalid"
-
-        if git diff --exit-code --quiet; then
-            echo "No changes to the output on this push; exiting."
-            exit 0
-        fi
-
-        git add .
-        git commit -m "Automatic deploy to GitHub Pages: ${SHA}"
-
         eval "$(ssh-agent -s)"
         ssh-add - <<< "${{ secrets.DEPLOY_KEY }}"
-
-        git push "$SSH_REPO" "$TARGET_BRANCH"
+    - name: Deploy
+      run: bash .github/deploy.sh