Extract deployment

2 files changed, 12 insertions, 91 deletions

diff --git a/.github/deploy.sh b/.github/deploy.sh
index 19dc4017166..d96c69392a1 100755..100644
--- a/.github/deploy.sh
+++ b/.github/deploy.sh
@@ -1,20 +1,7 @@
-#!/bin/bash
-
-# Automatically deploy on gh-pages
+#! /bin/bash
 
 set -ex
 
-SOURCE_BRANCH="master"
-TARGET_BRANCH="gh-pages"
-
-# Save some useful information
-REPO=$(git config remote.origin.url)
-SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
-SHA=$(git rev-parse --verify HEAD)
-
-# Clone the existing gh-pages for this repo into out/
-git clone --quiet --single-branch --branch "$TARGET_BRANCH" "$REPO" out
-
 echo "Removing the current docs for master"
 rm -rf out/master/ || exit 0
 
@@ -23,59 +10,34 @@ mkdir out/master/
 cp util/gh-pages/index.html out/master
 python ./util/export.py out/master/lints.json
 
-if [[ -n "$TRAVIS_TAG" ]]; then
-    echo "Save the doc for the current tag ($TRAVIS_TAG) and point current/ to it"
-    cp -r out/master "out/$TRAVIS_TAG"
-    rm -f out/current
-    ln -s "$TRAVIS_TAG" out/current
+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
-pushd out
 
+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
-popd
-
-# Pull requests and commits to other branches shouldn't try to deploy, just build to verify
-if [[ "$TRAVIS_PULL_REQUEST" != "false" ]] || [[ "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]]; then
-    # Tags should deploy
-    if [[ -z "$TRAVIS_TAG" ]]; then
-        echo "Generated, won't push"
-        exit 0
-    fi
-fi
 
 # Now let's go have some fun with the cloned repo
-cd out
-git config user.name "Travis CI"
-git config user.email "travis@ci.invalid"
+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
+  echo "No changes to the output on this push; exiting."
+  exit 0
 fi
-cd -
 
-# Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc
-ENCRYPTION_LABEL=e3a2d77100be
-ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
-ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
-ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
-ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-openssl aes-256-cbc -K "$ENCRYPTED_KEY" -iv "$ENCRYPTED_IV" -in .github/deploy_key.enc -out .github/deploy_key -d
-chmod 600 .github/deploy_key
-eval "$(ssh-agent -s)"
-ssh-add .github/deploy_key
-
-cd out
 git add .
 git commit -m "Automatic deploy to GitHub Pages: ${SHA}"
 
-# Now that we're all set up, we can push.
 git push "$SSH_REPO" "$TARGET_BRANCH"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 100adbadd5a..a3c9b1784a1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,47 +26,6 @@ jobs:
         path: 'out'
     - name: Deploy
       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"
+        bash .github/deploy.sh