From 22ae74d409b6c62148849757e7f615be17457da1 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 20:01:21 +0100
Subject: [PATCH 1/3] Use conditions to prevent builds on branches / tags other
 than master, dev and ng-*

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

diff --git a/.travis.yml b/.travis.yml
index e5f3cd91e..cf18825e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
         - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm64v8 docker build
       services:
@@ -68,8 +68,7 @@ jobs:
       virt: vm
       group: edge
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
-    
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm32v7 docker build
       services:
@@ -94,8 +93,7 @@ jobs:
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
-    
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: publish_manifest
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
@@ -131,7 +129,7 @@ jobs:
             echo "Not a tag and not on master, so not pushing tag/master specific manifest"
           fi
       on:
-        condition: '"${BUILD_DOCKER}" = 1'
+        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
 
 
 before_install:

From d258fdc783110b8abf0c5e1e5d57fbbdb03a8b73 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:22:35 +0100
Subject: [PATCH 2/3] Move build condition into separate stages list

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

diff --git a/.travis.yml b/.travis.yml
index cf18825e8..26153588e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,12 @@ language: python
 dist: focal
 os: linux
 
+stages:
+ - name: build_docker
+   if: branch =~ /^(master|dev|ng-.*)$/
+ - name: publish_manifest
+   if: branch =~ /^(master|dev|ng-.*)$/
+
 jobs:
   include:
     - name: "Paperless on Python 3.6"
@@ -47,8 +53,6 @@ jobs:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm64v8 docker build
       services:
@@ -67,8 +71,6 @@ jobs:
       arch: arm64-graviton2
       virt: vm
       group: edge
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: build_docker
       name: arm32v7 docker build
       services:
@@ -92,8 +94,6 @@ jobs:
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
     - stage: publish_manifest
       env:
         - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
@@ -128,8 +128,6 @@ jobs:
           else
             echo "Not a tag and not on master, so not pushing tag/master specific manifest"
           fi
-      on:
-        condition: '"${BUILD_DOCKER}" = 1 and ( branch =~ /^(master|dev|ng-.*)$/)'
 
 
 before_install:

From 80df0cc06a64984a8ddd344b314d45d6c3e07d63 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:24:39 +0100
Subject: [PATCH 3/3] Add stage definitions of test jobs and add test to list
 of stages

Defining the stages instead of having travis guess them and implicitly build an order
ensures that the test stage is executed before the docker images are built.
---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 26153588e..f4873cf3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ dist: focal
 os: linux
 
 stages:
+ - name: test
  - name: build_docker
    if: branch =~ /^(master|dev|ng-.*)$/
  - name: publish_manifest
@@ -12,21 +13,26 @@ stages:
 jobs:
   include:
     - name: "Paperless on Python 3.6"
+      stage: test
       python: "3.6"
 
     - name: "Paperless on Python 3.7"
+      stage: test
       python: "3.7"
 
     - name: "Paperless on Python 3.8"
+      stage: test
       python: "3.8"
 
     - name: "Documentation"
+      stage: test
       script:
         - cd docs/
         - make html
       after_success: true
 
     - name: "Front end"
+      stage: test
       language: node_js
       node_js:
         - 15