mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Merge branch 'dev' into feature-black
This commit is contained in:
		
							
								
								
									
										59
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										59
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -142,35 +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, codeformatting, codestyle] | ||||
|     runs-on: ubuntu-20.04 | ||||
|     steps: | ||||
|       - | ||||
| @@ -281,7 +254,7 @@ jobs: | ||||
|   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, codeformatting, codestyle] | ||||
|     steps: | ||||
|       - | ||||
|         name: Prepare | ||||
| @@ -302,26 +275,12 @@ jobs: | ||||
|       - | ||||
|         name: Checkout | ||||
|         uses: actions/checkout@v2 | ||||
|       - | ||||
|         name: Download frontend artifact | ||||
|         uses: actions/download-artifact@v2 | ||||
|         with: | ||||
|           name: frontend-compiled | ||||
|           path: src/documents/static/frontend/ | ||||
|       - | ||||
|         name: Set up Docker Buildx | ||||
|         uses: docker/setup-buildx-action@v1 | ||||
|       - | ||||
|         name: Set up QEMU | ||||
|         uses: docker/setup-qemu-action@v1 | ||||
|       - | ||||
|         name: Cache Docker layers | ||||
|         uses: actions/cache@v2 | ||||
|         with: | ||||
|           path: /tmp/.buildx-cache | ||||
|           key: ${{ runner.os }}-buildx-${{ github.sha }} | ||||
|           restore-keys: | | ||||
|             ${{ runner.os }}-buildx- | ||||
|       - | ||||
|         name: Login to Github Container Registry | ||||
|         uses: docker/login-action@v1 | ||||
| @@ -338,9 +297,19 @@ jobs: | ||||
|           platforms: linux/amd64,linux/arm/v7,linux/arm64 | ||||
|           push: true | ||||
|           tags: ${{ steps.prepare.outputs.tags }} | ||||
|           cache-from: type=local,src=/tmp/.buildx-cache | ||||
|           cache-to: type=local,dest=/tmp/.buildx-cache | ||||
|           cache-from: type=gha | ||||
|           cache-to: type=gha,mode=max | ||||
|       - | ||||
|         name: Inspect image | ||||
|         run: | | ||||
|           docker buildx imagetools inspect ${{ steps.prepare.outputs.inspect_tag }} | ||||
|       - | ||||
|         name: Export frontend artifact from docker | ||||
|         run: | | ||||
|           docker cp ${{ steps.prepare.outputs.tags }}:/src/src/documents/static/frontend/ src/documents/static/frontend/ | ||||
|       - | ||||
|         name: Upload frontend artifact | ||||
|         uses: actions/upload-artifact@v2 | ||||
|         with: | ||||
|           name: frontend-compiled | ||||
|           path: src/documents/static/frontend/ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Quinn Casey
					Quinn Casey