From b0625cdced9c79f5a3d8931060ba65faadb0e733 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Thu, 8 Dec 2022 18:39:14 -0800 Subject: [PATCH] Updates runners to Ubuntu 22.04, locks pipenv to 2022.11.30, reduces number of image cleans run --- .github/workflows/ci.yml | 24 +++++++++---------- .github/workflows/cleanup-tags.yml | 7 +----- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/installer-library.yml | 2 +- .github/workflows/project-actions.yml | 4 ++-- .github/workflows/release-chart.yml | 2 +- .../workflows/reusable-workflow-builder.yml | 2 +- Dockerfile | 2 +- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23ace6a3a..6a12189a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ on: jobs: pre-commit: name: Linting Checks - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout repository @@ -34,7 +34,7 @@ jobs: documentation: name: "Build Documentation" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - pre-commit steps: @@ -44,7 +44,7 @@ jobs: - name: Install pipenv run: | - pipx install pipenv==2022.10.12 + pipx install pipenv==2022.11.30 - name: Set up Python uses: actions/setup-python@v4 @@ -73,7 +73,7 @@ jobs: documentation-deploy: name: "Deploy Documentation" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.event_name == 'push' && github.ref == 'refs/heads/main' needs: - documentation @@ -92,7 +92,7 @@ jobs: tests-backend: name: "Tests (${{ matrix.python-version }})" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - pre-commit strategy: @@ -124,7 +124,7 @@ jobs: - name: Install pipenv run: | - pipx install pipenv==2022.10.12 + pipx install pipenv==2022.11.30 - name: Set up Python uses: actions/setup-python@v4 @@ -181,7 +181,7 @@ jobs: tests-frontend: name: "Tests Frontend" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - pre-commit strategy: @@ -201,7 +201,7 @@ jobs: prepare-docker-build: name: Prepare Docker Pipeline Data if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/beta' || contains(github.ref, 'beta.rc') || startsWith(github.ref, 'refs/tags/v')) - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # If the push triggered the installer library workflow, wait for it to # complete here. This ensures the required versions for the final # image have been built, while not waiting at all if the versions haven't changed @@ -278,7 +278,7 @@ jobs: # build and push image to docker hub. build-docker-image: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 concurrency: group: ${{ github.workflow }}-build-docker-image-${{ github.ref_name }} cancel-in-progress: true @@ -383,7 +383,7 @@ jobs: build-release: needs: - build-docker-image - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -462,7 +462,7 @@ jobs: path: dist/paperless-ngx.tar.xz publish-release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: prerelease: ${{ steps.get_version.outputs.prerelease }} changelog: ${{ steps.create-release.outputs.body }} @@ -511,7 +511,7 @@ jobs: asset_content_type: application/x-xz append-changelog: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - publish-release if: needs.publish-release.outputs.prerelease == 'false' diff --git a/.github/workflows/cleanup-tags.yml b/.github/workflows/cleanup-tags.yml index 2b63b3000..4a5deeb9c 100644 --- a/.github/workflows/cleanup-tags.yml +++ b/.github/workflows/cleanup-tags.yml @@ -6,12 +6,7 @@ name: Cleanup Image Tags on: - schedule: - - cron: '0 0 * * SAT' delete: - pull_request: - types: - - closed push: paths: - ".github/workflows/cleanup-tags.yml" @@ -26,7 +21,7 @@ concurrency: jobs: cleanup-images: name: Cleanup Image Tags for ${{ matrix.primary-name }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: include: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c742807e9..e1c6eebb8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: actions: read contents: read diff --git a/.github/workflows/installer-library.yml b/.github/workflows/installer-library.yml index f761b0315..33e81a3d1 100644 --- a/.github/workflows/installer-library.yml +++ b/.github/workflows/installer-library.yml @@ -34,7 +34,7 @@ concurrency: jobs: prepare-docker-build: name: Prepare Docker Image Version Data - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Set ghcr repository name diff --git a/.github/workflows/project-actions.yml b/.github/workflows/project-actions.yml index 2d3e4549e..717b3c2d3 100644 --- a/.github/workflows/project-actions.yml +++ b/.github/workflows/project-actions.yml @@ -24,7 +24,7 @@ env: jobs: issue_opened_or_reopened: name: issue_opened_or_reopened - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.event_name == 'issues' && (github.event.action == 'opened' || github.event.action == 'reopened') steps: - name: Add issue to project and set status to ${{ env.todo }} @@ -37,7 +37,7 @@ jobs: status_value: ${{ env.todo }} # Target status pr_opened_or_reopened: name: pr_opened_or_reopened - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: # write permission is required for autolabeler pull-requests: write diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml index 9e21850ca..a82ac4ed8 100644 --- a/.github/workflows/release-chart.yml +++ b/.github/workflows/release-chart.yml @@ -9,7 +9,7 @@ on: jobs: release_chart: name: "Release Chart" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/reusable-workflow-builder.yml b/.github/workflows/reusable-workflow-builder.yml index ba1358e56..37d51b122 100644 --- a/.github/workflows/reusable-workflow-builder.yml +++ b/.github/workflows/reusable-workflow-builder.yml @@ -21,7 +21,7 @@ concurrency: jobs: build-image: name: Build ${{ fromJSON(inputs.build-json).name }} @ ${{ fromJSON(inputs.build-json).version }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout diff --git a/Dockerfile b/Dockerfile index 32598c483..28764aef3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ COPY Pipfile* ./ RUN set -eux \ && echo "Installing pipenv" \ - && python3 -m pip install --no-cache-dir --upgrade pipenv==2022.10.12 \ + && python3 -m pip install --no-cache-dir --upgrade pipenv==2022.11.30 \ && echo "Generating requirement.txt" \ && pipenv requirements > requirements.txt