From 59975087c550429f9cb121bf769baf4621812ed1 Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Wed, 2 Mar 2022 11:18:17 -0800 Subject: [PATCH 1/3] Update paperless-ng to paperless-ngx --- .github/workflows/ci.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c2ffb6b9..7165a27c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,37 +177,37 @@ jobs: name: Move files run: | mkdir dist - mkdir dist/paperless-ng - mkdir dist/paperless-ng/scripts - cp .dockerignore .env Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/ - cp paperless.conf.example dist/paperless-ng/paperless.conf - cp gunicorn.conf.py dist/paperless-ng/gunicorn.conf.py - cp docker/ dist/paperless-ng/docker -r - cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/ - cp src/ dist/paperless-ng/src -r - cp docs/_build/html/ dist/paperless-ng/docs -r + mkdir dist/paperless-ngx + mkdir dist/paperless-ngx/scripts + cp .dockerignore .env Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ngx/ + cp paperless.conf.example dist/paperless-ngx/paperless.conf + cp gunicorn.conf.py dist/paperless-ngx/gunicorn.conf.py + cp docker/ dist/paperless-ngx/docker -r + cp scripts/*.service scripts/*.sh dist/paperless-ngx/scripts/ + cp src/ dist/paperless-ngx/src -r + cp docs/_build/html/ dist/paperless-ngx/docs -r - name: Compile messages run: | - cd dist/paperless-ng/src + cd dist/paperless-ngx/src python3 manage.py compilemessages - name: Collect static files run: | - cd dist/paperless-ng/src + cd dist/paperless-ngx/src python3 manage.py collectstatic --no-input - name: Make release package run: | cd dist find . -name __pycache__ | xargs rm -r - tar -cJf paperless-ng.tar.xz paperless-ng/ + tar -cJf paperless-ngx.tar.xz paperless-ngx/ - name: Upload release artifact uses: actions/upload-artifact@v2 with: name: release - path: dist/paperless-ng.tar.xz + path: dist/paperless-ngx.tar.xz publish-release: runs-on: ubuntu-latest @@ -233,11 +233,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ng-${{ steps.get_version.outputs.version }} - release_name: Paperless-ng ${{ steps.get_version.outputs.version }} + release_name: Paperless-ngx ${{ steps.get_version.outputs.version }} draft: false prerelease: false body: | - For a complete list of changes, see the changelog at https://paperless-ng.readthedocs.io/en/latest/changelog.html. + For a complete list of changes, see the changelog at https://paperless-ngx.readthedocs.io/en/latest/changelog.html. - name: Upload release archive id: upload-release-asset @@ -246,8 +246,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./paperless-ng.tar.xz - asset_name: paperless-ng-${{ steps.get_version.outputs.version }}.tar.xz + asset_path: ./paperless-ngx.tar.xz + asset_name: paperless-ngx-${{ steps.get_version.outputs.version }}.tar.xz asset_content_type: application/x-xz # build and push image to docker hub. From f8991ca8e09ebf7ccbf52ff7aba2600c176147d5 Mon Sep 17 00:00:00 2001 From: Marc Schaefer Date: Wed, 2 Mar 2022 21:00:43 +0100 Subject: [PATCH 2/3] Switch ci.yml from ng to ngx --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7165a27c0..c5bc1937b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -224,7 +224,7 @@ jobs: name: Get version id: get_version run: | - echo ::set-output name=version::${GITHUB_REF#refs/tags/ng-} + echo ::set-output name=version::${GITHUB_REF#refs/tags/ngx-} - name: Create release id: create_release @@ -232,7 +232,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ng-${{ steps.get_version.outputs.version }} + tag_name: ngx-${{ steps.get_version.outputs.version }} release_name: Paperless-ngx ${{ steps.get_version.outputs.version }} draft: false prerelease: false @@ -252,7 +252,7 @@ jobs: # build and push image to docker hub. 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-')) + if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ngx-')) runs-on: ubuntu-latest needs: [tests, codeformatting, codestyle] steps: @@ -261,8 +261,8 @@ jobs: id: prepare run: | IMAGE_NAME=ghcr.io/${{ github.repository }} - if [[ $GITHUB_REF == refs/tags/ng-* ]]; then - TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/tags/ng-},${IMAGE_NAME}:latest + if [[ $GITHUB_REF == refs/tags/ngx-* ]]; then + TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/tags/ngx-},${IMAGE_NAME}:latest INSPECT_TAG=${IMAGE_NAME}:latest elif [[ $GITHUB_REF == refs/heads/* ]]; then TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/heads/} From 37531ec5e08bfb791989695802a1edfe41352853 Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Wed, 2 Mar 2022 12:18:29 -0800 Subject: [PATCH 3/3] Fix "incorrect type" YAML error --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5bc1937b..9a42b786e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,8 @@ name: ci on: push: - tags: ngx-* + tags: + - ngx-* branches-ignore: - 'translations**' pull_request: