diff --git a/.github/settings.yml b/.github/settings.yml index d3fac69..b239820 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -52,11 +52,7 @@ branches: strict: false contexts: - ci/woodpecker/pr/lint - - ci/woodpecker/pr/test/1 - - ci/woodpecker/pr/test/2 - - ci/woodpecker/pr/test/3 - - ci/woodpecker/pr/test/4 - - ci/woodpecker/pr/test/5 + - ci/woodpecker/pr/test - ci/woodpecker/pr/build-package - ci/woodpecker/pr/build-container - ci/woodpecker/pr/docs diff --git a/.woodpecker/build-container.yml b/.woodpecker/build-container.yml index e5ca9b5..1f27eb8 100644 --- a/.woodpecker/build-container.yml +++ b/.woodpecker/build-container.yml @@ -6,14 +6,13 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - build: + - name: build image: docker.io/library/python:3.12 commands: - - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry build - dryrun: + - name: dryrun image: quay.io/thegeeklab/wp-docker-buildx:2 settings: containerfile: Containerfile.multiarch @@ -26,9 +25,9 @@ steps: when: - event: [pull_request] - publish-dockerhub: - group: container + - name: publish-dockerhub image: quay.io/thegeeklab/wp-docker-buildx:2 + group: container settings: auto_tag: true containerfile: Containerfile.multiarch @@ -47,9 +46,9 @@ steps: branch: - ${CI_REPO_DEFAULT_BRANCH} - publish-quay: - group: container + - name: publish-quay image: quay.io/thegeeklab/wp-docker-buildx:2 + group: container settings: auto_tag: true containerfile: Containerfile.multiarch diff --git a/.woodpecker/build-package.yml b/.woodpecker/build-package.yml index 336d26e..4b75817 100644 --- a/.woodpecker/build-package.yml +++ b/.woodpecker/build-package.yml @@ -6,27 +6,25 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - build: + - name: build image: docker.io/library/python:3.12 commands: - - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry build - checksum: + - name: checksum image: quay.io/thegeeklab/alpine-tools commands: - cd dist/ && sha256sum * > ../sha256sum.txt - changelog: + - name: changelog image: quay.io/thegeeklab/git-sv commands: - - git fetch --depth=2147483647 - git sv current-version - git sv release-notes -t ${CI_COMMIT_TAG:-next} -o CHANGELOG.md - cat CHANGELOG.md - publish-github: + - name: publish-github image: docker.io/plugins/github-release settings: api_key: @@ -40,15 +38,14 @@ steps: when: - event: [tag] - publish-pypi: + - name: publish-pypi image: docker.io/library/python:3.12 secrets: - - source: pypi_password - target: POETRY_HTTP_BASIC_PYPI_PASSWORD - - source: pypi_username - target: POETRY_HTTP_BASIC_PYPI_USERNAME + - source: pypi_password + target: POETRY_HTTP_BASIC_PYPI_PASSWORD + - source: pypi_username + target: POETRY_HTTP_BASIC_PYPI_USERNAME commands: - - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry publish -n when: diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index 7ed7d5e..4d915dc 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -6,27 +6,27 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - markdownlint: + - name: markdownlint image: quay.io/thegeeklab/markdownlint-cli group: test commands: - markdownlint 'README.md' 'CONTRIBUTING.md' - spellcheck: + - name: spellcheck image: quay.io/thegeeklab/alpine-tools group: test commands: - - spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls + - spellchecker --files 'docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls environment: FORCE_COLOR: "true" - link-validation: + - name: link-validation image: docker.io/lycheeverse/lychee group: test commands: - lychee --no-progress --format detailed README.md - pushrm-dockerhub: + - name: pushrm-dockerhub image: docker.io/chko/docker-pushrm:1 secrets: - source: docker_password @@ -43,7 +43,7 @@ steps: - ${CI_REPO_DEFAULT_BRANCH} status: [success] - pushrm-quay: + - name: pushrm-quay image: docker.io/chko/docker-pushrm:1 secrets: - source: quay_token diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index a47ca26..6ce3e5d 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -6,20 +6,18 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - check-format: + - name: check-format image: docker.io/library/python:3.12 commands: - - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry install - poetry run ruff format --check --diff ./${CI_REPO_NAME//-/} environment: PY_COLORS: "1" - check-coding: + - name: check-coding image: docker.io/library/python:3.12 commands: - - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry install - poetry run ruff ./${CI_REPO_NAME//-/} diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml index a851904..9957125 100644 --- a/.woodpecker/notify.yml +++ b/.woodpecker/notify.yml @@ -8,7 +8,7 @@ when: runs_on: [success, failure] steps: - matrix: + - name: matrix image: quay.io/thegeeklab/wp-matrix settings: homeserver: diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index cb5458e..6d5bb96 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -5,22 +5,34 @@ when: branch: - ${CI_REPO_DEFAULT_BRANCH} -matrix: - PYTHON_VERSION: - - "3.8" - - "3.9" - - "3.10" - - "3.11" - - "3.12" - -steps: - pytest: - image: docker.io/library/python:${PYTHON_VERSION} +variables: + - &pytest_base + group: pytest commands: - - git fetch --depth=2147483647 - pip install poetry poetry-dynamic-versioning -qq - poetry install - poetry version - poetry run ${CI_REPO_NAME} --help environment: PY_COLORS: "1" + +steps: + - name: python-312 + image: docker.io/library/python:3.12 + <<: *pytest_base + + - name: python-311 + image: docker.io/library/python:3.11 + <<: *pytest_base + + - name: python-310 + image: docker.io/library/python:3.10 + <<: *pytest_base + + - name: python-39 + image: docker.io/library/python:3.9 + <<: *pytest_base + + - name: python-38 + image: docker.io/library/python:3.8 + <<: *pytest_base