From a2d4239db04fccd963f1472645ca36ea2405d2dc Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Mon, 7 Jan 2019 16:42:30 +0000
Subject: [PATCH] CI: Pull scripts out into files

Still trying to get the github integration working
---
 .travis.yml             | 17 ++---------------
 bin/travis-pre-build.sh | 23 +++++++++++++++++++++++
 bin/travis-push.sh      | 13 +++++++++++++
 3 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100755 bin/travis-pre-build.sh
 create mode 100755 bin/travis-push.sh

diff --git a/.travis.yml b/.travis.yml
index 527495dab..e7facdf90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,21 +12,8 @@ jobs:
       script: ./bin/test.sh
     - stage: build
       script:
-        - npm --force install tiddlywiki
-        - pwd
-        - cd output
-        - git init
-        - git config --global user.email "travis@travis-ci.org"
-        - git config --global user.name "Travis CI"
-        - git remote add upstream "https://$GH_TOKEN@github.com/Jermolene/Testing2019.git"
-        - git fetch upstream
-        - git reset upstream/master
-        - cd ..
+        - ./bin/travis-pre-build.sh
         - export TW5_BUILD_DETAILS="Built from branch '$TRAVIS_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin)"
         - export TW5_BUILD_TIDDLYWIKI='./node_modules/tiddlywiki/tiddlywiki.js'
         - ./bin/build-site.sh
-        - cd output
-        - git add -A .
-        - git commit --message "Travis build: $TRAVIS_BUILD_NUMBER"
-        - git push -q upstream HEAD:master >/dev/null 2>&1
-        - cd ..
+        - ./bin/travis-push.sh
diff --git a/bin/travis-pre-build.sh b/bin/travis-pre-build.sh
new file mode 100755
index 000000000..d3f467f73
--- /dev/null
+++ b/bin/travis-pre-build.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Pull existing GitHub pages content
+
+npm --force install tiddlywiki || exit 1
+
+mkdir -p output || exit 1
+
+cd output || exit 1
+
+git init || exit 1
+
+git config --global user.email "travis@travis-ci.org" || exit 1
+
+git config --global user.name "Travis CI" || exit 1
+
+git remote add upstream "https://$GH_TOKEN@github.com/Jermolene/Testing2019.git" || exit 1
+
+git fetch upstream || exit 1
+
+git reset upstream/master || exit 1
+
+cd .. || exit 1
diff --git a/bin/travis-push.sh b/bin/travis-push.sh
new file mode 100755
index 000000000..44e439163
--- /dev/null
+++ b/bin/travis-push.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Push output back to GitHub
+
+cd output || exit 1
+
+git add -A . || exit 1
+
+git commit --message "Travis build: $TRAVIS_BUILD_NUMBER" || exit 1
+
+git push -q upstream HEAD:master >/dev/null 2>&1 || exit 1
+
+cd .. || exit 1