From: Quinn Casey <quinn@quinncasey.com>
Date: Mon, 28 Feb 2022 15:31:52 +0000 (-0800)
Subject: Merge branch 'dev' into feature-black
X-Git-Tag: ngx-1.6.0-rc1~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F168%2Fhead;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev' into feature-black
---

bc58e459ead14035e3a61b4bf3deb693b12a0983
diff --cc .github/workflows/ci.yml
index 3798adf7c6,26c2ba0dc9..b55d83128b
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@@ -142,35 -144,8 +142,8 @@@ jobs
            cd src/
            coveralls --service=github
  
-   frontend:
-     runs-on: ubuntu-20.04
-     steps:
-     -
-       name: Checkout
-       uses: actions/checkout@v2
-     -
-       uses: actions/setup-node@v2
-       with:
-         node-version: '16'
-     -
-       name: Configure version on dev branches
-       if: startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev'
-       run: |
-         git_hash=$(git rev-parse --short "$GITHUB_SHA")
-         git_branch=${GITHUB_REF#refs/heads/}
-         sed -i -E "s/version: \"(.*)\"/version: \"${git_branch} ${git_hash}\"/g" src-ui/src/environments/environment.prod.ts
-     -
-       name: Build frontend
-       run: ./compile-frontend.sh
-     -
-       name: Upload artifact
-       uses: actions/upload-artifact@v2
-       with:
-         name: frontend-compiled
-         path: src/documents/static/frontend/
- 
    build-release:
-     needs: [frontend, documentation, tests, codeformatting, codestyle]
 -    needs: [build-docker-image, documentation, tests, whitespace, codestyle]
++    needs: [build-docker-image, documentation, tests, codeformatting, codestyle]
      runs-on: ubuntu-20.04
      steps:
        -
@@@ -281,7 -256,7 +254,7 @@@
    build-docker-image:
      if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
      runs-on: ubuntu-latest
-     needs: [frontend, tests, codeformatting, codestyle]
 -    needs: [tests, whitespace, codestyle]
++    needs: [tests, codeformatting, codestyle]
      steps:
        -
          name: Prepare