From 385108fceb68b0126d836a723348b80b6fc2a0a2 Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Tue, 3 Dec 2019 19:15:21 +0000
Subject: [PATCH] corrected upload scripts

---
 .travis.yml                |  4 ++++
 buildScripts/doItAllTravis | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08ef055..c6c5cc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@ branches:
   except:  # do not build tags that we create using the upload.sh script
     - /^(?i:continuous.*)$/
 
+env:
+  global:
+    - DOCKER_FROM="ubuntu:18.04"
+
 #addons:
 #  apt:
 #  update: true
diff --git a/buildScripts/doItAllTravis b/buildScripts/doItAllTravis
index f4a5a37..821583f 100755
--- a/buildScripts/doItAllTravis
+++ b/buildScripts/doItAllTravis
@@ -7,19 +7,19 @@ export MAKE_PARALLEL="-j $(nproc)"
 
 export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 
-./buildScripts/versionEnvs       || travis_terminate 1;
-./buildScripts/reportEnvs        || travis_terminate 1;
-./buildScripts/getBuildTools     || travis_terminate 1;
-./buildScripts/getDevLibraries   || travis_terminate 1;
-./buildScripts/getPoppler        || travis_terminate 1;
-./buildScripts/buildPoppler      || travis_terminate 1;
-./buildScripts/installPoppler    || travis_terminate 1;
-./buildScripts/getFontforge      || travis_terminate 1;
-./buildScripts/buildFontforge    || travis_terminate 1;
-./buildScripts/installFontforge  || travis_terminate 1;
-./buildScripts/buildPdf2htmlEX   || travis_terminate 1;
-./buildScripts/installPdf2htmlEX || travis_terminate 1;
-./buildScripts/createAppImage    || travis_terminate 1;
-./buildScripts/createDockerImage || travis_terminate 1;
-./buildScripts/uploadRelease     || travis_terminate 1;
-
+./buildScripts/versionEnvs         || travis_terminate 1;
+./buildScripts/reportEnvs          || travis_terminate 1;
+./buildScripts/getBuildTools       || travis_terminate 1;
+./buildScripts/getDevLibraries     || travis_terminate 1;
+./buildScripts/getPoppler          || travis_terminate 1;
+./buildScripts/buildPoppler        || travis_terminate 1;
+./buildScripts/installPoppler      || travis_terminate 1;
+./buildScripts/getFontforge        || travis_terminate 1;
+./buildScripts/buildFontforge      || travis_terminate 1;
+./buildScripts/installFontforge    || travis_terminate 1;
+./buildScripts/buildPdf2htmlEX     || travis_terminate 1;
+./buildScripts/installPdf2htmlEX   || travis_terminate 1;
+./buildScripts/createAppImage      || travis_terminate 1;
+./buildScripts/createDockerImage   || travis_terminate 1;
+./buildScripts/uploadGitHubRelease || travis_terminate 1;
+./buildScripts/uploadDockerImage   || travis_terminate 1;