From cc6da552f1ad35ab610a32fae805a3334b01230c Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 22 Dec 2023 12:17:03 +0100 Subject: [PATCH] use list style synatx and cleanup --- .woodpecker/build-container.yml | 12 ++++++------ .woodpecker/build-package.yml | 18 +++++++++--------- .woodpecker/docs.yml | 27 +++++++++++++++------------ .woodpecker/lint.yml | 4 ++-- .woodpecker/notify.yml | 2 +- .woodpecker/test.yml | 2 +- 6 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.woodpecker/build-container.yml b/.woodpecker/build-container.yml index e5ca9b5..b33e0f7 100644 --- a/.woodpecker/build-container.yml +++ b/.woodpecker/build-container.yml @@ -6,14 +6,14 @@ 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 +26,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 +47,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..18c1d74 100644 --- a/.woodpecker/build-package.yml +++ b/.woodpecker/build-package.yml @@ -6,19 +6,19 @@ 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 @@ -26,7 +26,7 @@ steps: - 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,13 +40,13 @@ 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 diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index f30ebf4..3bc7119 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -6,49 +6,52 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - assets: + - name: assets image: quay.io/thegeeklab/alpine-tools commands: - make doc - 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 docs/content README.md - testbuild: + - name: testbuild image: quay.io/thegeeklab/hugo:0.115.2 commands: - hugo --panicOnWarning -s docs/ -b http://localhost:8000/ - build: + - name: build image: quay.io/thegeeklab/hugo:0.115.2 commands: + # Fetch is used to get the full git history. + # Required for Hugos git metadata integration. + - git fetch --depth=2147483647 - hugo --panicOnWarning -s docs/ - beautify: + - name: beautify image: quay.io/thegeeklab/alpine-tools commands: - html-beautify -r -f 'docs/public/**/*.html' environment: FORCE_COLOR: "true" - publish: + - name: publish image: quay.io/thegeeklab/wp-s3-action settings: access_key: @@ -67,9 +70,9 @@ steps: - event: [push, manual] branch: - ${CI_REPO_DEFAULT_BRANCH} - status: [success] + status: [success, failure] - pushrm-dockerhub: + - name: pushrm-dockerhub image: docker.io/chko/docker-pushrm:1 secrets: - source: docker_password @@ -86,7 +89,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..6b0d2d6 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -6,7 +6,7 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - check-format: + - name: check-format image: docker.io/library/python:3.12 commands: - git fetch --depth=2147483647 @@ -16,7 +16,7 @@ steps: environment: PY_COLORS: "1" - check-coding: + - name: check-coding image: docker.io/library/python:3.12 commands: - git fetch --depth=2147483647 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 e94ad1a..700c07b 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -14,7 +14,7 @@ matrix: - "3.12" steps: - pytest: + - name: pytest image: docker.io/library/python:${PYTHON_VERSION} commands: - git fetch --depth=2147483647