From 9aed0aceea2a780191a8be970dc83949367ac50a Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:24:57 +0100
Subject: [PATCH 01/60] Removing travis in favor of github actions

---
 .travis.yml | 153 ----------------------------------------------------
 1 file changed, 153 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f4873cf3c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-language: python
-
-dist: focal
-os: linux
-
-stages:
- - name: test
- - name: build_docker
-   if: branch =~ /^(master|dev|ng-.*)$/
- - name: publish_manifest
-   if: branch =~ /^(master|dev|ng-.*)$/
-
-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
-      before_install: true
-      install:
-        - cd src-ui/
-        - npm install -g @angular/cli
-        - npm install
-      script:
-        - ng build --prod
-      after_success: true
-
-    - stage: build_docker
-      name: amd64 docker build
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - 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
-    - stage: build_docker
-      name: arm64v8 docker build
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
-        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
-        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
-      arch: arm64-graviton2
-      virt: vm
-      group: edge
-    - stage: build_docker
-      name: arm32v7 docker build
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
-        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
-        # which is amd64.
-        - sed -i "s/FROM node:15/FROM node@$(docker manifest inspect node:15 | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
-        - sed -i "s/FROM python:3.7-slim/FROM python@$(docker manifest inspect python:3.7-slim | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
-        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
-        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
-        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
-      env:
-        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
-    - stage: publish_manifest
-      env:
-        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
-      services:
-        - docker
-      before_install:
-        - true
-      install:
-        - true
-      after_success:
-        - true
-      script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
-        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
-        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
-        - docker manifest push --purge ${DOCKER_REPO}:${TRAVIS_COMMIT}
-        - |
-          if [ "${TRAVIS_BRANCH}" = "master" ]; then
-            echo "Master branch detected"
-            DOCKER_TAG="latest"
-          else
-            DOCKER_TAG=${TRAVIS_TAG}
-          fi
-        - |
-          if [ "${DOCKER_TAG}" != "" ]; then
-            echo "Create Tag ${DOCKER_TAG}"
-            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
-            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
-            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
-            docker manifest push --purge ${DOCKER_REPO}:${DOCKER_TAG}
-          else
-            echo "Not a tag and not on master, so not pushing tag/master specific manifest"
-          fi
-
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-
-install:
-  - pip install --upgrade pipenv
-  - pipenv install --system --dev
-
-script:
-  - cd src/
-  - pipenv run pytest --cov
-  - pipenv run pycodestyle
-
-after_success:
-  - pipenv run coveralls

From 645ba2d425c9f1be8852fa6edb434b774abc2080 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:27:22 +0100
Subject: [PATCH 02/60] Experimenting with github actions

---
 .github/workflows/docker-publish.yml | 63 ++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/workflows/docker-publish.yml

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 000000000..f2da6b3b8
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,63 @@
+name: Docker
+
+on:
+  push:
+    branches: travis-multiarch-builds
+
+jobs:
+  # Build and push image to docker hub.
+  buildx:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prepare
+        run: |
+          DOCKER_IMAGE=MarkSchmitt/paperless-ng
+          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          if [ "${{ github.event_name }}" = "schedule" ]; then
+            VERSION=nightly
+          fi
+          TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
+          fi
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+            --build-arg VERSION=${VERSION} \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${GITHUB_SHA::8} \
+            ${TAGS} --file ./Dockerfile .
+      - name: install buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3.1.0
+
+      - name: Docker Buildx (build)
+        run: |
+          docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
+      - name: Docker Login
+        if: success() && github.event_name != 'pull_request'
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      - name: Docker Buildx (push)
+        if: success() && github.event_name != 'pull_request'
+        run: |
+          docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+      - name: Docker Check Manifest
+        if: always() && github.event_name != 'pull_request'
+        run: |
+          docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
+      - name: Clear
+        if: always() && github.event_name != 'pull_request'
+        run: |
+          rm -f ${HOME}/.docker/config.json
\ No newline at end of file

From 94ab1dd5c4971a98c7859c4d2eda0843d4759e76 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 31 Dec 2020 19:32:04 +0100
Subject: [PATCH 03/60] Update docker-publish.yml

---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f2da6b3b8..5ee210ef2 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Prepare
         id: prepare
         run: |
-          DOCKER_IMAGE=MarkSchmitt/paperless-ng
+          DOCKER_IMAGE=moztr/paperless-ng
           DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
           VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -60,4 +60,4 @@ jobs:
       - name: Clear
         if: always() && github.event_name != 'pull_request'
         run: |
-          rm -f ${HOME}/.docker/config.json
\ No newline at end of file
+          rm -f ${HOME}/.docker/config.json

From d9992fb318466d1f1d8477f27815fd4f970ed9ad Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 1 Jan 2021 12:53:16 +0100
Subject: [PATCH 04/60] Removed separate build step

It looks like part of the build step is repeated in the push step
due to bad caching possibly.
---
 .github/workflows/docker-publish.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5ee210ef2..53d53e25c 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -38,10 +38,6 @@ jobs:
       - name: install buildx
         id: buildx
         uses: crazy-max/ghaction-docker-buildx@v3.1.0
-
-      - name: Docker Buildx (build)
-        run: |
-          docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
       - name: Docker Login
         if: success() && github.event_name != 'pull_request'
         env:

From f9430e1bd24ce6ec81bf502f4d7a9e3728e6d6d0 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:04:46 +0100
Subject: [PATCH 05/60] Execute python tests

---
 .github/workflows/docker-publish.yml | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 53d53e25c..a2897c05b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -5,6 +5,47 @@ on:
     branches: travis-multiarch-builds
 
 jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: [3.7, 3.8, 3.9]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip${{ matrix.python-version }}
+    - name: Update system, install system requirements
+      run: |
+        apt-get update -qq
+        apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
+    - name: Upgrade pip, Install dependencies
+      run: |
+        pip install --upgrade pip pipenv sphinx
+        pipenv lock -r > requirements.txt
+        pip install -r requirements.txt
+    - name: Run sphinx
+      run: |
+        sphinx-build -b html ../docs ../docs/_build -W    
+    - name: Execute Tests
+      run: |
+        cd src/
+        pytest --cov
+        pycodestyle
+    - name: Execute coveralls
+      run: |
+        coveralls
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From 004ecc94b0fd9d6764d8f44dfe1a58f362e8f7b5 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:08:19 +0100
Subject: [PATCH 06/60] Use sudo for apt

---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a2897c05b..f6ac55c1e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -28,8 +28,8 @@ jobs:
         key: ${{ runner.os }}-pip${{ matrix.python-version }}
     - name: Update system, install system requirements
       run: |
-        apt-get update -qq
-        apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip, Install dependencies
       run: |
         pip install --upgrade pip pipenv sphinx

From a83d5c39797178edd171d412c405fbdfbec8029f Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:15:10 +0100
Subject: [PATCH 07/60] Execute pip commands one after the other to find issue

---
 .github/workflows/docker-publish.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f6ac55c1e..a810f134f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -30,10 +30,14 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
-    - name: Upgrade pip, Install dependencies
+    - name: Upgrade pip
       run: |
         pip install --upgrade pip pipenv sphinx
+    - name: Gather pip requirements
+      run: |
         pipenv lock -r > requirements.txt
+    - name: Insall pip requirements
+      run: |
         pip install -r requirements.txt
     - name: Run sphinx
       run: |

From 192d27dd3c80de4adf23201e472a2f83b010daf2 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:19:58 +0100
Subject: [PATCH 08/60] Move sphinx step below tests step as it used to be

---
 .github/workflows/docker-publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a810f134f..e020fb66b 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -36,17 +36,17 @@ jobs:
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt
-    - name: Insall pip requirements
+    - name: Install pip requirements
       run: |
         pip install -r requirements.txt
-    - name: Run sphinx
-      run: |
-        sphinx-build -b html ../docs ../docs/_build -W    
     - name: Execute Tests
       run: |
         cd src/
         pytest --cov
         pycodestyle
+    - name: Run sphinx
+      run: |
+        sphinx-build -b html ../docs ../docs/_build -W    
     - name: Execute coveralls
       run: |
         coveralls

From 3bb351186a13977b981d1b062b2218daf253255a Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:23:49 +0100
Subject: [PATCH 09/60] Add pytest to install step

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e020fb66b..c074b1d2f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx
+        pip install --upgrade pip pipenv sphinx pytest
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt

From 0beba2eb1ed97ae5d41b041e48eeb9066fb8a6bd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:31:20 +0100
Subject: [PATCH 10/60] Add pytest-cov to install

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index c074b1d2f..9bba2e031 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx pytest
+        pip install --upgrade pip pipenv sphinx pytest pytest-cov
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt

From 00c0634dcbd547a25a823881832bdb32b7dcea48 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:41:21 +0100
Subject: [PATCH 11/60] Remove cache to see if that helps with pytest-cov
 issues

---
 .github/workflows/docker-publish.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 9bba2e031..090cfa937 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,15 +17,6 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip${{ matrix.python-version }}
     - name: Update system, install system requirements
       run: |
         sudo apt-get update -qq

From 7026f4143839083035f68a43e6adc1beadb95e8d Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 09:44:08 +0100
Subject: [PATCH 12/60] Try o make pipenv also install dev dependencies

---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 090cfa937..24c3fe062 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,10 +23,10 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx pytest pytest-cov
+        pip install --upgrade pip pipenv sphinx
     - name: Gather pip requirements
       run: |
-        pipenv lock -r > requirements.txt
+        pipenv lock --dev -r > requirements.txt
     - name: Install pip requirements
       run: |
         pip install -r requirements.txt

From 9563cf576b572ed1ac0dd60126a66dee900f4735 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:23:30 +0100
Subject: [PATCH 13/60] github-actions: readding explicit install

explicitly install pytest, pytest-cov and coveralls.
I think travis already did that and we need to explicitly do so now.
removed installing dev-dependencies, do it explicitly.
(just trying to reproduce the travis-ci build)
---
 .github/workflows/docker-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 24c3fe062..afbb2571f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,10 +23,10 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx
+        pip install --upgrade pip pipenv sphinx pytest pytest-cov coveralls
     - name: Gather pip requirements
       run: |
-        pipenv lock --dev -r > requirements.txt
+        pipenv lock -r > requirements.txt
     - name: Install pip requirements
       run: |
         pip install -r requirements.txt

From 8d2d040346e4b396858ec509a2413397a40c64b3 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:27:38 +0100
Subject: [PATCH 14/60] github-actions: removing unsupported parameter

I don't understand what the "-n auto" parameter does, pytest doesn't either
(in the version installed) - so removing it to see if that produces something
usable.
---
 src/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/setup.cfg b/src/setup.cfg
index 2a1a348bd..f43c9adf6 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -3,7 +3,7 @@ exclude = migrations, paperless/settings.py, .tox, */tests/*
 
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=paperless.settings
-addopts = --pythonwarnings=all --cov --cov-report=html -n auto
+addopts = --pythonwarnings=all --cov --cov-report=html
 env =
   PAPERLESS_DISABLE_DBHANDLER=true
 

From 07556450300ebea030506b49d847d1f74952a286 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:30:12 +0100
Subject: [PATCH 15/60] github-actions: also install wheel

There's an error about pip wheel not being available and falling back
to some legacy version. Let's see if this helps.
---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index afbb2571f..a7a399c3f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,7 +23,7 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv sphinx pytest pytest-cov coveralls
+        pip install --upgrade pip pipenv wheel sphinx pytest pytest-cov coveralls
     - name: Gather pip requirements
       run: |
         pipenv lock -r > requirements.txt

From 0e73e56312259288d54eb8a9cd899e46bba2dd98 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:33:56 +0100
Subject: [PATCH 16/60] github-actions: readding previously removed "-n auto"

possibly this is fixed by the wheel dependency that was missing before.
---
 src/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/setup.cfg b/src/setup.cfg
index f43c9adf6..2a1a348bd 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -3,7 +3,7 @@ exclude = migrations, paperless/settings.py, .tox, */tests/*
 
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=paperless.settings
-addopts = --pythonwarnings=all --cov --cov-report=html
+addopts = --pythonwarnings=all --cov --cov-report=html -n auto
 env =
   PAPERLESS_DISABLE_DBHANDLER=true
 

From be9f04cf6cb77a3a17a3d6043183f12775e8a2e7 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:18:56 +0100
Subject: [PATCH 17/60] Explicitly set ubuntu-20.04 as OS and install dev
 dependencies

---
 .github/workflows/docker-publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a7a399c3f..d29fd7740 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -9,8 +9,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        python-version: [3.7, 3.8, 3.9]
+        os: [ubuntu-20.04]
+        python-version: 3.7
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -23,10 +23,10 @@ jobs:
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
     - name: Upgrade pip
       run: |
-        pip install --upgrade pip pipenv wheel sphinx pytest pytest-cov coveralls
+        pip install --upgrade pip pipenv
     - name: Gather pip requirements
       run: |
-        pipenv lock -r > requirements.txt
+        pipenv lock --dev -r > requirements.txt
     - name: Install pip requirements
       run: |
         pip install -r requirements.txt

From 2562f1b44397c56c3eeb1200a4ba74fde1843b08 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:22:35 +0100
Subject: [PATCH 18/60] Revert job strategy matrix change

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d29fd7740..cfda3d10d 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: 3.7
+        python-version: [3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

From afdcc0908fb598d5f325aeac2f0d2eac0f8e8614 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 12:24:48 +0100
Subject: [PATCH 19/60] Only build python 3.7 and say so in the Pipfile too

---
 .github/workflows/docker-publish.yml | 2 +-
 Pipfile                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index cfda3d10d..0d2c8bd68 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/Pipfile b/Pipfile
index 48759307c..e0f1d83d8 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,7 +9,7 @@ verify_ssl = true
 name = "piwheels"
 
 [requires]
-python_version = "3.6"
+python_version = "3.7"
 
 [packages]
 dateparser = "~=0.7.6"

From a0cac680bc2e96845d71572104cbad01d25a764d Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:00:35 +0100
Subject: [PATCH 20/60] Revert python version in Pipfile to 3.6

---
 Pipfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pipfile b/Pipfile
index e0f1d83d8..48759307c 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,7 +9,7 @@ verify_ssl = true
 name = "piwheels"
 
 [requires]
-python_version = "3.7"
+python_version = "3.6"
 
 [packages]
 dateparser = "~=0.7.6"

From 89bec6de1ba4e9db43d049da9b03589eedc0ebd1 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:10:16 +0100
Subject: [PATCH 21/60] Try to reproduce exactly what's done in the travis
 build to test

---
 .github/workflows/docker-publish.yml | 30 ++++++++--------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0d2c8bd68..66bc73ea8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,37 +10,23 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.7]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Update system, install system requirements
+    - name: Tests
       run: |
         sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr
-    - name: Upgrade pip
-      run: |
-        pip install --upgrade pip pipenv
-    - name: Gather pip requirements
-      run: |
-        pipenv lock --dev -r > requirements.txt
-    - name: Install pip requirements
-      run: |
-        pip install -r requirements.txt
-    - name: Execute Tests
-      run: |
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        pip install --upgrade pipenv
+        pipenv install --system --dev
         cd src/
-        pytest --cov
-        pycodestyle
-    - name: Run sphinx
-      run: |
-        sphinx-build -b html ../docs ../docs/_build -W    
-    - name: Execute coveralls
-      run: |
-        coveralls
+        pipenv run pytest --cov
+        pipenv run pycodestyle
+        pipenv run coveralls
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From 94083f8f195b9539fc8fcd0145f6c5d0135c7d91 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:17:13 +0100
Subject: [PATCH 22/60] Try manually replacing the python-version

---
 .github/workflows/docker-publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 66bc73ea8..264552168 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -21,6 +21,8 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        echo "Replacing python version with ${matrix.python-version}"
+        sed -i "s/python_version = \"3.6\"/python_version = \"${matrix.python-version}\"/" Pipfile
         pip install --upgrade pipenv
         pipenv install --system --dev
         cd src/

From a8fb681bd514bc16803ef3e8b79758417065c5cd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:19:00 +0100
Subject: [PATCH 23/60] Print the env

---
 .github/workflows/docker-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 264552168..9904d8623 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,6 +19,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Tests
       run: |
+        env
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         echo "Replacing python version with ${matrix.python-version}"

From a59570e2d87ffa4e29875a20616a6895ebee3849 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:28:47 +0100
Subject: [PATCH 24/60] Only build for 3.6

---
 .github/workflows/docker-publish.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 9904d8623..23c8aef20 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -19,11 +19,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Tests
       run: |
-        env
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        echo "Replacing python version with ${matrix.python-version}"
-        sed -i "s/python_version = \"3.6\"/python_version = \"${matrix.python-version}\"/" Pipfile
         pip install --upgrade pipenv
         pipenv install --system --dev
         cd src/

From 61fc77c49cd718daa192ec065f64370d12cd8c33 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:44:02 +0100
Subject: [PATCH 25/60] Add GITHUB_TOKEN to python tests

---
 .github/workflows/docker-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 23c8aef20..01bf72595 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -18,6 +18,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Tests
+      env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng

From b9c55eb80cbabacce7b208aa9a9e47b0cfa66453 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 4 Jan 2021 15:45:12 +0100
Subject: [PATCH 26/60] Fix yaml

---
 .github/workflows/docker-publish.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 01bf72595..c0a1565c6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -18,7 +18,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Tests
-      env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng

From 15bd99f325328ba3e8270d1593d23d5dc693523a Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 09:05:14 +0100
Subject: [PATCH 27/60] Try to make pip and pipenv use the installed python
 version

---
 .github/workflows/docker-publish.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index c0a1565c6..a61c570ce 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6]
+        python-version: [3.6,3.7,3.8]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -20,10 +20,13 @@ jobs:
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        MATRIX_PYTHON_VERSION: ${{strategy.matrix.python-version}}
       run: |
+        echo "Selected python version from matrix is: ${MATRIX_PYTHON_VERSION}"
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv
+        pyenv global system ${MATRIX_PYTHON_VERSION}
         pipenv install --system --dev
         cd src/
         pipenv run pytest --cov

From ee017d273c306f911312cd6b6b73156783f8b84e Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 09:10:45 +0100
Subject: [PATCH 28/60] Use another python action instead

---
 .github/workflows/docker-publish.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a61c570ce..ec60880c9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -12,21 +12,20 @@ jobs:
         os: [ubuntu-20.04]
         python-version: [3.6,3.7,3.8]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v2
+      - name: Install python version
+        uses: gabrielfalcao/pyenv-action@v5
+        with:
+          default: "${{ matrix.python-version }}"
+          command: pip install -U pip  # upgrade pip after installing python
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        MATRIX_PYTHON_VERSION: ${{strategy.matrix.python-version}}
       run: |
         echo "Selected python version from matrix is: ${MATRIX_PYTHON_VERSION}"
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv
-        pyenv global system ${MATRIX_PYTHON_VERSION}
         pipenv install --system --dev
         cd src/
         pipenv run pytest --cov

From 092ad2c6f8217bdf136683d64eb8b5fd704a0d79 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:20:31 +0100
Subject: [PATCH 29/60] Remove comment from yaml

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ec60880c9..81eba7e4f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,7 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python-version }}"
-          command: pip install -U pip  # upgrade pip after installing python
+          command: pip install -U pip
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 81ac158bfb22952a2997d1b2893a4f98d47bb074 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 10:22:24 +0100
Subject: [PATCH 30/60] Remove command - should be unnecessary

---
 .github/workflows/docker-publish.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 81eba7e4f..f13b7399e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,6 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python-version }}"
-          command: pip install -U pip
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 551488f62c12e7b95563ddbf5f385283493394f4 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:48:03 +0100
Subject: [PATCH 31/60] Trying to use pyenv action step

---
 .github/workflows/docker-publish.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f13b7399e..490a5edec 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,13 +10,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: [3.6,3.7,3.8]
+        python: [3.6,3.7,3.8]
     steps:
       - uses: actions/checkout@v2
       - name: Install python version
         uses: gabrielfalcao/pyenv-action@v5
         with:
-          default: "${{ matrix.python-version }}"
+          default: "${{ matrix.python }}"
+          command: pip install -U pip  # upgrade pip after installing python
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 8f2492ea20a993b29950c3b72930741d6013cfe8 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:50:11 +0100
Subject: [PATCH 32/60] List python versions differently so the pyenv action
 might light it better

---
 .github/workflows/docker-publish.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 490a5edec..6507a6203 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,7 +10,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python: [3.6,3.7,3.8]
+        python: 
+          - 3.6
+          - 3.7
+          - 3.8
     steps:
       - uses: actions/checkout@v2
       - name: Install python version

From 8a51f6e23622e247fe72581caef774d24a410c54 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:52:40 +0100
Subject: [PATCH 33/60] Specify exact version

---
 .github/workflows/docker-publish.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6507a6203..203133335 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python: 
-          - 3.6
-          - 3.7
-          - 3.8
+          - 3.6.8
+          - 3.7.5
+          - 3.8.2
     steps:
       - uses: actions/checkout@v2
       - name: Install python version

From 7e5fc1c2d3be5f1f5d7104bdfcb3e144cefb1b90 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:53:32 +0100
Subject: [PATCH 34/60] Remove comment

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 203133335..b0dc46ba5 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -20,7 +20,7 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python }}"
-          command: pip install -U pip  # upgrade pip after installing python
+          command: pip install -U pip
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 79e95dff8a297304cc7e7c211b48dd159b86ca05 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:54:11 +0100
Subject: [PATCH 35/60] Quote command

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index b0dc46ba5..558ebea69 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -20,7 +20,7 @@ jobs:
         uses: gabrielfalcao/pyenv-action@v5
         with:
           default: "${{ matrix.python }}"
-          command: pip install -U pip
+          command: "pip install -U pip"
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From ca9b05cd76fc69bb92212db27fc0c68c48b33a19 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:55:41 +0100
Subject: [PATCH 36/60] Update to a possibly working version of pyenv-action

According to https://github.com/gabrielfalcao/pyenv-action/issues/136 this
version should work
---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 558ebea69..6b43b8710 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v5
+        uses: gabrielfalcao/pyenv-action@v7
         with:
           default: "${{ matrix.python }}"
           command: "pip install -U pip"

From 435a638dc266ee6fd3ffe0798dc0b4162dabedec Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:57:34 +0100
Subject: [PATCH 37/60] Fix yaml: indentation was wrong

---
 .github/workflows/docker-publish.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6b43b8710..1ec70f146 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -15,12 +15,12 @@ jobs:
           - 3.7.5
           - 3.8.2
     steps:
-      - uses: actions/checkout@v2
-      - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v7
-        with:
-          default: "${{ matrix.python }}"
-          command: "pip install -U pip"
+    - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "${{ matrix.python }}"
+        command: "pip install -U pip"
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 65ee707de48c6f9978249422b7552cab30e48004 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 23:06:40 +0100
Subject: [PATCH 38/60] Remove debugging line and specify release versions

---
 .github/workflows/docker-publish.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1ec70f146..5e9ed8632 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python: 
-          - 3.6.8
-          - 3.7.5
-          - 3.8.2
+          - 3.6
+          - 3.7
+          - 3.8
     steps:
     - uses: actions/checkout@v2
     - name: Install python version
@@ -25,7 +25,6 @@ jobs:
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        echo "Selected python version from matrix is: ${MATRIX_PYTHON_VERSION}"
         sudo apt-get update -qq
         sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv

From 51d29f998afc0083a38e219edc28a9a8e470fa80 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 23:10:06 +0100
Subject: [PATCH 39/60] Looks like we need to specify the exact version

---
 .github/workflows/docker-publish.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5e9ed8632..042d64f24 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -11,9 +11,9 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python: 
-          - 3.6
-          - 3.7
-          - 3.8
+          - 3.6.8
+          - 3.7.9
+          - 3.8.7
     steps:
     - uses: actions/checkout@v2
     - name: Install python version

From 7987a278cf80f5fcb050719c5c838711707711ec Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 6 Jan 2021 23:11:54 +0100
Subject: [PATCH 40/60] Use 3.8.6

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 042d64f24..8a199abcd 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -13,7 +13,7 @@ jobs:
         python: 
           - 3.6.8
           - 3.7.9
-          - 3.8.7
+          - 3.8.6
     steps:
     - uses: actions/checkout@v2
     - name: Install python version

From dd4d908d44c519a41e5fa664ea906966936f7179 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:32:43 +0100
Subject: [PATCH 41/60] Docker build step depends on tests

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 8a199abcd..649fba14d 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -36,7 +36,7 @@ jobs:
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
-
+    needs: tests
     steps:
       - uses: actions/checkout@v2
 

From bc1f479e1c7db65f8498f1855a510099ad6500d6 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:42:25 +0100
Subject: [PATCH 42/60] Adding documentation and frontend steps from travis
 build

---
 .github/workflows/docker-publish.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 649fba14d..50fdbfd31 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -33,6 +33,33 @@ jobs:
         pipenv run pytest --cov
         pipenv run pycodestyle
         pipenv run coveralls
+    documentation:
+      steps:
+      - uses: actions/checkout@v2
+      - name: dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+          pip install --upgrade pipenv
+          pipenv install --system --dev
+      - name: make
+        run: |
+          cd docs/
+          make html
+    frontend:
+      steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '15'
+      - name: dependencies
+        run: |
+          cd src-ui/
+          npm install -g @angular/cli
+          npm install
+      - name: build
+        run: |
+          ng build --prod
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From f7cf842342004f337bd96fbb4671df54c50583b0 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:43:45 +0100
Subject: [PATCH 43/60] Fix identation

---
 .github/workflows/docker-publish.yml | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 50fdbfd31..74e5c0ac7 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -33,33 +33,33 @@ jobs:
         pipenv run pytest --cov
         pipenv run pycodestyle
         pipenv run coveralls
-    documentation:
-      steps:
-      - uses: actions/checkout@v2
-      - name: dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-          pip install --upgrade pipenv
-          pipenv install --system --dev
-      - name: make
-        run: |
-          cd docs/
-          make html
-    frontend:
-      steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '15'
-      - name: dependencies
-        run: |
-          cd src-ui/
-          npm install -g @angular/cli
-          npm install
-      - name: build
-        run: |
-          ng build --prod
+  documentation:
+    steps:
+    - uses: actions/checkout@v2
+    - name: dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        pip install --upgrade pipenv
+        pipenv install --system --dev
+    - name: make
+      run: |
+        cd docs/
+        make html
+  frontend:
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '15'
+    - name: dependencies
+      run: |
+        cd src-ui/
+        npm install -g @angular/cli
+        npm install
+    - name: build
+      run: |
+        ng build --prod
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest

From f7c6cd4e8ae147feef82edab13140c53325a38f6 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:44:36 +0100
Subject: [PATCH 44/60] Add missing runs-on

---
 .github/workflows/docker-publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 74e5c0ac7..76a7f18e2 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -34,6 +34,7 @@ jobs:
         pipenv run pycodestyle
         pipenv run coveralls
   documentation:
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: dependencies
@@ -47,6 +48,7 @@ jobs:
         cd docs/
         make html
   frontend:
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2

From ba629ea726ef0e41f41c3105b6c5d3be391159e4 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:45:17 +0100
Subject: [PATCH 45/60] ADd documentation and frontend to dependency for docker
 build

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 76a7f18e2..f2467cbf9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -65,7 +65,7 @@ jobs:
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
-    needs: tests
+    needs: [tests, documentation, frontend]
     steps:
       - uses: actions/checkout@v2
 

From b14cbd4963b14ad108040f46ec5f5ccf2fbe892b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:47:42 +0100
Subject: [PATCH 46/60] ALso install python before using pip in the
 documentation job

---
 .github/workflows/docker-publish.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f2467cbf9..6c3bf87f9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -37,6 +37,11 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "3.6.8"
+        command: "pip install -U pip"
     - name: dependencies
       run: |
         sudo apt-get update -qq

From 3fb26fab9527c5bd1f5d6cfc2e858f5d7a051115 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:48:32 +0100
Subject: [PATCH 47/60] Simplify node build

---
 .github/workflows/docker-publish.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6c3bf87f9..ab93fd8e7 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -59,13 +59,11 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: '15'
-    - name: dependencies
+    - name: build
       run: |
         cd src-ui/
         npm install -g @angular/cli
         npm install
-    - name: build
-      run: |
         ng build --prod
   # Build and push image to docker hub.
   buildx:

From a3f58634979e5eefef4dab760ec9956acbcaf28c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 07:57:12 +0100
Subject: [PATCH 48/60] Try installing sphinx simply with apt

---
 .github/workflows/docker-publish.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index ab93fd8e7..3d62a9f18 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -45,9 +45,7 @@ jobs:
     - name: dependencies
       run: |
         sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
+        sudo apt-get install -qq python3-sphinx
     - name: make
       run: |
         cd docs/

From 62c0dc55384ce5508f0f9adf4f51977bb544178f Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:37:25 +0100
Subject: [PATCH 49/60] Use pip to install sphinx

Not sure why pipenv install doesn't do the trick .. let's try this way first
---
 .github/workflows/docker-publish.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 3d62a9f18..54281492e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -44,8 +44,7 @@ jobs:
         command: "pip install -U pip"
     - name: dependencies
       run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq python3-sphinx
+        pip install 'sphinx~=3.3' sphinx_rtd_theme
     - name: make
       run: |
         cd docs/

From 033264013176d9f0e034a92e789dab184377bd98 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:44:05 +0100
Subject: [PATCH 50/60] Add pip cache

Try to be a good citizen and use caches instead of hitting the repos all the time
---
 .github/workflows/docker-publish.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 54281492e..bce52b2e0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -21,6 +21,15 @@ jobs:
       with:
         default: "${{ matrix.python }}"
         command: "pip install -U pip"
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip${{ matrix.python }}
     - name: Tests
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 3181eac6dfa270f15e402182b1ee414538aaa054 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:50:04 +0100
Subject: [PATCH 51/60] Try to insall sphinx from pipfile

---
 .github/workflows/docker-publish.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index bce52b2e0..479f52a2c 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -53,7 +53,8 @@ jobs:
         command: "pip install -U pip"
     - name: dependencies
       run: |
-        pip install 'sphinx~=3.3' sphinx_rtd_theme
+        pip install --upgrade pipenv
+        pipenv install --system --dev --ignore-pipfile
     - name: make
       run: |
         cd docs/

From 7118890f856bb08798c44f06f7edcea30fd0948c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 08:56:48 +0100
Subject: [PATCH 52/60] Install pip

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 479f52a2c..fcdf93c8f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -54,7 +54,7 @@ jobs:
     - name: dependencies
       run: |
         pip install --upgrade pipenv
-        pipenv install --system --dev --ignore-pipfile
+        pipenv install --system --dev
     - name: make
       run: |
         cd docs/

From 205bb6c6ce07f226cb3adaf6056f56a484093174 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Thu, 7 Jan 2021 09:02:29 +0100
Subject: [PATCH 53/60] Try to use pip cache and install dependnecies like in
 tests

---
 .github/workflows/docker-publish.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index fcdf93c8f..a3329b7ba 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -50,9 +50,20 @@ jobs:
       uses: gabrielfalcao/pyenv-action@v7
       with:
         default: "3.6.8"
-        command: "pip install -U pip"
+        command: "pip install -U pip"    
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip3.6.8}
     - name: dependencies
       run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
         pip install --upgrade pipenv
         pipenv install --system --dev
     - name: make

From 9e7257634a06a5409a3ebef0f10de1ded9a9c7bb Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:23:17 +0100
Subject: [PATCH 54/60] Testing excluding docker builds if not specific ref is
 selected

---
 .github/workflows/docker-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a3329b7ba..14a4eb042 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -87,6 +87,7 @@ jobs:
   buildx:
     runs-on: ubuntu-latest
     needs: [tests, documentation, frontend]
+    if: github.ref == 'refs/heads/github-action-test'
     steps:
       - uses: actions/checkout@v2
 

From 729f0178037a23dfb1bead0c4de5f999d88b707c Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:33:08 +0100
Subject: [PATCH 55/60] Separate github action into separete workflow files

---
 .../{docker-publish.yml => docker.yml}        | 78 -------------------
 .github/workflows/documentation.yml           | 32 ++++++++
 .github/workflows/frontend.yml                | 16 ++++
 .github/workflows/test.yml                    | 43 ++++++++++
 4 files changed, 91 insertions(+), 78 deletions(-)
 rename .github/workflows/{docker-publish.yml => docker.yml} (50%)
 create mode 100644 .github/workflows/documentation.yml
 create mode 100644 .github/workflows/frontend.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker.yml
similarity index 50%
rename from .github/workflows/docker-publish.yml
rename to .github/workflows/docker.yml
index 14a4eb042..338ae85a9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker.yml
@@ -5,84 +5,6 @@ on:
     branches: travis-multiarch-builds
 
 jobs:
-  tests:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        python: 
-          - 3.6.8
-          - 3.7.9
-          - 3.8.6
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install python version
-      uses: gabrielfalcao/pyenv-action@v7
-      with:
-        default: "${{ matrix.python }}"
-        command: "pip install -U pip"
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip${{ matrix.python }}
-    - name: Tests
-      env: 
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
-        cd src/
-        pipenv run pytest --cov
-        pipenv run pycodestyle
-        pipenv run coveralls
-  documentation:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install python version
-      uses: gabrielfalcao/pyenv-action@v7
-      with:
-        default: "3.6.8"
-        command: "pip install -U pip"    
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-    - name: Persistent Github pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip3.6.8}
-    - name: dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
-        pip install --upgrade pipenv
-        pipenv install --system --dev
-    - name: make
-      run: |
-        cd docs/
-        make html
-  frontend:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: '15'
-    - name: build
-      run: |
-        cd src-ui/
-        npm install -g @angular/cli
-        npm install
-        ng build --prod
   # Build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
new file mode 100644
index 000000000..2e2e84e84
--- /dev/null
+++ b/.github/workflows/documentation.yml
@@ -0,0 +1,32 @@
+name: backend-tests
+
+# always run documentation workflow to ensure the documentation can still be built
+on: push
+
+# possibly add a publish job for automatic read-the-docs publishing
+jobs:
+  documentation:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "3.6.8"
+        command: "pip install -U pip"    
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip3.6.8}
+    - name: dependencies
+      run: |
+        pip install 'sphinx~=3.3' sphinx_rtd_theme
+    - name: make
+      run: |
+        cd docs/
+        make html
\ No newline at end of file
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
new file mode 100644
index 000000000..64df45127
--- /dev/null
+++ b/.github/workflows/frontend.yml
@@ -0,0 +1,16 @@
+
+
+jobs:
+  frontend:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '15'
+    - name: build
+      run: |
+        cd src-ui/
+        npm install -g @angular/cli
+        npm install
+        ng build --prod
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..930f368e7
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,43 @@
+name: backend-tests
+
+# always run tests workflow
+on: push
+
+jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python: 
+          - 3.6.8
+          - 3.7.9
+          - 3.8.6
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install python version
+      uses: gabrielfalcao/pyenv-action@v7
+      with:
+        default: "${{ matrix.python }}"
+        command: "pip install -U pip"
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+    - name: Persistent Github pip cache
+      uses: actions/cache@v2
+      with:
+        path: ${{ steps.pip-cache.outputs.dir }}
+        key: ${{ runner.os }}-pip${{ matrix.python }}
+    - name: Tests
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript optipng
+        pip install --upgrade pipenv
+        pipenv install --system --dev
+        cd src/
+        pipenv run pytest --cov
+        pipenv run pycodestyle
+        pipenv run coveralls

From f35c843af7bf18e844c4092a42b9cbf1370f9e56 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 11:34:04 +0100
Subject: [PATCH 56/60] Give the frontend workflow a name

---
 .github/workflows/frontend.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 64df45127..ad44fb717 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,4 +1,7 @@
+name: frontend
 
+# always run frontend workflow
+on: push
 
 jobs:
   frontend:

From bd8f462fae0a048e70e5cecf79a19815bed5dbd1 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:37:25 +0100
Subject: [PATCH 57/60] github action improved tagging

---
 .github/workflows/docker.yml        | 24 +++++++++++++-----------
 .github/workflows/documentation.yml |  1 +
 .github/workflows/frontend.yml      |  2 +-
 .github/workflows/test.yml          |  4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 338ae85a9..715474a85 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,32 +1,34 @@
-name: Docker
+name: docker
 
 on:
   push:
-    branches: travis-multiarch-builds
+    branches:
+    - master
+    - dev
+    tags:
+    - 'ng-*'
 
 jobs:
-  # Build and push image to docker hub.
+  # build and push image to docker hub.
   buildx:
     runs-on: ubuntu-latest
-    needs: [tests, documentation, frontend]
-    if: github.ref == 'refs/heads/github-action-test'
     steps:
       - uses: actions/checkout@v2
-
       - name: Prepare
         id: prepare
+        env:
+          DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
         run: |
-          DOCKER_IMAGE=moztr/paperless-ng
           DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64/v8
           VERSION=edge
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
+            VERSION=${GITHUB_REF#refs/tags/}
           fi
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-            VERSION=nightly
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
           fi
           TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+          if [[ $VERSION == "master" ]]; then
             TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
           fi
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 2e2e84e84..12bd3577d 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -24,6 +24,7 @@ jobs:
         path: ${{ steps.pip-cache.outputs.dir }}
         key: ${{ runner.os }}-pip3.6.8}
     - name: dependencies
+      # instead of directly installing the dependency in the workflow file, can this be done using the pipfile instead?
       run: |
         pip install 'sphinx~=3.3' sphinx_rtd_theme
     - name: make
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index ad44fb717..66a9a9b0c 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,6 +1,6 @@
 name: frontend
 
-# always run frontend workflow
+# always run frontend workflow to see if it builds and tests run fine
 on: push
 
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 930f368e7..1a235f763 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,8 +8,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        python: 
+        os: ubuntu-20.04]
+        python: # pyenv-action requires the exact version
           - 3.6.8
           - 3.7.9
           - 3.8.6

From 1ffe4e6f646a3a3a31a833460475fbb8192c65f8 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:39:20 +0100
Subject: [PATCH 58/60] Fix typo in yaml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a235f763..ec601d57e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ubuntu-20.04]
+        os: [ubuntu-20.04]
         python: # pyenv-action requires the exact version
           - 3.6.8
           - 3.7.9

From af0834236ddd7afec5c337bc526ee36e20af1108 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Fri, 8 Jan 2021 20:42:17 +0100
Subject: [PATCH 59/60] Fix name of documentation workflow

---
 .github/workflows/documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 12bd3577d..67047d6cd 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,4 +1,4 @@
-name: backend-tests
+name: documentation
 
 # always run documentation workflow to ensure the documentation can still be built
 on: push

From d89c045049b7c78f3c7eff53d177f0498e6005ea Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Sat, 9 Jan 2021 08:06:55 +0100
Subject: [PATCH 60/60] Run tests, documentation and frontend build also on
 pull_request

---
 .github/workflows/documentation.yml | 2 +-
 .github/workflows/frontend.yml      | 2 +-
 .github/workflows/test.yml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 67047d6cd..00835d240 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,7 +1,7 @@
 name: documentation
 
 # always run documentation workflow to ensure the documentation can still be built
-on: push
+on: [push, pull_request]
 
 # possibly add a publish job for automatic read-the-docs publishing
 jobs:
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 66a9a9b0c..4cb36d3a4 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -1,7 +1,7 @@
 name: frontend
 
 # always run frontend workflow to see if it builds and tests run fine
-on: push
+on: [push, pull_request]
 
 jobs:
   frontend:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ec601d57e..9766c4b5b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: backend-tests
 
 # always run tests workflow
-on: push
+on: [push, pull_request]
 
 jobs:
   tests: