From e91eb451bb29253064956df97c7bf199386b7fa3 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Mon, 8 Jul 2019 16:02:58 +0100
Subject: [PATCH 1/6] testing optional submission

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5d4dc07db..37d9cd3ed 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,6 +55,7 @@ script:
   - docker stop $(docker ps -a -q)
   - docker rm $(docker ps -a -q)
 after_success:
-- cd $TRAVIS_BUILD_DIR
-- docker login -u $DOCKER_USER -p $DOCKER_PASS
-- docker push $REPO:$TAG
+  type NOT IN (pull_request)
+  - cd $TRAVIS_BUILD_DIR
+  - docker login -u $DOCKER_USER -p $DOCKER_PASS
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then docker push $REPO:$TAG ; fi

From 6d8f92e118058dc98b46958dcb08c5893d6024a5 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Mon, 8 Jul 2019 16:04:02 +0100
Subject: [PATCH 2/6] both not needed

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 37d9cd3ed..8a4df6a1c 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,4 +58,4 @@ after_success:
   type NOT IN (pull_request)
   - cd $TRAVIS_BUILD_DIR
   - docker login -u $DOCKER_USER -p $DOCKER_PASS
-  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then docker push $REPO:$TAG ; fi
+  - docker push $REPO:$TAG

From a72952fb1bb70534a232f2939ac18886c912e5be Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Mon, 8 Jul 2019 17:06:55 +0100
Subject: [PATCH 3/6] syntax fix

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8a4df6a1c..a255950f2 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,8 @@ script:
   - docker stop $(docker ps -a -q)
   - docker rm $(docker ps -a -q)
 after_success:
-  type NOT IN (pull_request)
+  - name: deploy
+  if: type NOT IN (pull_request)
   - cd $TRAVIS_BUILD_DIR
   - docker login -u $DOCKER_USER -p $DOCKER_PASS
   - docker push $REPO:$TAG

From 909a36f730c6ae78e124472a6cb47fc479be1404 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Mon, 8 Jul 2019 17:07:17 +0100
Subject: [PATCH 4/6] layout fix

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a255950f2..9733930a6 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,6 @@ script:
 after_success:
   - name: deploy
   if: type NOT IN (pull_request)
-  - cd $TRAVIS_BUILD_DIR
-  - docker login -u $DOCKER_USER -p $DOCKER_PASS
-  - docker push $REPO:$TAG
+    - cd $TRAVIS_BUILD_DIR
+    - docker login -u $DOCKER_USER -p $DOCKER_PASS
+    - docker push $REPO:$TAG

From 005a92ee503e760923b6343c738188dd1e983ce2 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Mon, 8 Jul 2019 17:16:15 +0100
Subject: [PATCH 5/6] syntax fix

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9733930a6..dd448082a 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,8 +55,9 @@ script:
   - docker stop $(docker ps -a -q)
   - docker rm $(docker ps -a -q)
 after_success:
-  - name: deploy
-  if: type NOT IN (pull_request)
-    - cd $TRAVIS_BUILD_DIR
-    - docker login -u $DOCKER_USER -p $DOCKER_PASS
-    - docker push $REPO:$TAG
+  - stage: "deploy"  
+    script:
+      - cd $TRAVIS_BUILD_DIR
+      - docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - docker push $REPO:$TAG
+    if: type NOT IN (pull_request)

From 1ad094a0c26720a615bbef5a067fd1f3dbdb9894 Mon Sep 17 00:00:00 2001
From: Rob Court <rcourt@ed.ac.uk>
Date: Mon, 8 Jul 2019 17:36:39 +0100
Subject: [PATCH 6/6] reverting syntax

---
 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd448082a..6a7c60762 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,9 +55,8 @@ script:
   - docker stop $(docker ps -a -q)
   - docker rm $(docker ps -a -q)
 after_success:
-  - stage: "deploy"  
-    script:
-      - cd $TRAVIS_BUILD_DIR
-      - docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - docker push $REPO:$TAG
-    if: type NOT IN (pull_request)
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      cd $TRAVIS_BUILD_DIR;
+      docker login -u $DOCKER_USER -p $DOCKER_PASS;
+      docker push $REPO:$TAG;
+     fi;