From 8322ac05dd92a112f374172c475ae9139d9e3a77 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 22 Dec 2023 12:00:05 +0100 Subject: [PATCH] use list style synatx and cleanup (#752) --- .woodpecker/build-package.yml | 14 ++++++-------- .woodpecker/docs.yml | 25 +++++++++++++------------ .woodpecker/notify.yml | 2 +- .woodpecker/test.yml | 18 ++++++++---------- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/.woodpecker/build-package.yml b/.woodpecker/build-package.yml index 81e1650..69f1aeb 100644 --- a/.woodpecker/build-package.yml +++ b/.woodpecker/build-package.yml @@ -6,31 +6,29 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - assets: + - name: assets image: docker.io/library/node:lts commands: - git fetch --depth=2147483647 - - npm install > /dev/null + - npm install --quiet --no-progress - npm run build - cat VERSION environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error - package: + - name: package image: docker.io/library/node:lts commands: - npm run pack environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error - 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 @@ -38,7 +36,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: diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index c646750..91e40ad 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -6,23 +6,22 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - markdownlint: + - name: markdownlint image: quay.io/thegeeklab/markdownlint-cli commands: - markdownlint 'exampleSite/content/**/*.md' 'README.md' 'CONTRIBUTING.md' - spellcheck: + - name: spellcheck image: quay.io/thegeeklab/alpine-tools commands: - spellchecker --files 'exampleSite/content/**/*.md' 'README.md' -d .dictionary -p spell indefinite-article syntax-urls frontmatter --frontmatter-keys title environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error - assets: + - name: assets image: docker.io/library/node:lts commands: - - npm install > /dev/null + - npm install --quiet --no-progress - npm run svg-sprite-list - mkdir -p exampleSite/themes/${CI_REPO_NAME} - curl -sSL https://github.com/${CI_REPO}/releases/latest/download/${CI_REPO_NAME}.tar.gz | tar -xz -C exampleSite/themes/${CI_REPO_NAME}/ --strip-components=1 @@ -32,33 +31,34 @@ steps: branch: - ${CI_REPO_DEFAULT_BRANCH} - assets-main: + - name: assets-main image: docker.io/library/node:lts commands: - - npm install > /dev/null + - npm install --quiet --no-progress - npm run build - npm run svg-sprite-list - mkdir -p exampleSite/themes/ && ln -s $(pwd)/ exampleSite/themes/${CI_REPO_NAME} environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error when: - event: [pull_request] - 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 exampleSite/ - beautify: + - name: beautify image: quay.io/thegeeklab/alpine-tools commands: - html-beautify -r -f 'exampleSite/public/**/*.html' environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error - publish: + - name: publish image: quay.io/thegeeklab/wp-s3-action settings: access_key: @@ -77,6 +77,7 @@ steps: - event: [push, manual] branch: - ${CI_REPO_DEFAULT_BRANCH} + status: [success, failure] depends_on: - build-package 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 c13a912..996f5f6 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -6,43 +6,41 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - eslint: + - name: eslint image: docker.io/library/node:lts commands: - - npm install > /dev/null + - npm install --quiet --no-progress - npm run lint environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error - assets: + - name: assets image: docker.io/library/node:lts commands: - - npm install > /dev/null + - npm install --quiet --no-progress - npm run build environment: FORCE_COLOR: "true" - NPM_CONFIG_LOGLEVEL: error - testbuild: + - name: testbuild image: quay.io/thegeeklab/hugo:0.115.2 commands: - mkdir -p exampleSite/themes/ && ln -s $(pwd)/ exampleSite/themes/${CI_REPO_NAME} - hugo --panicOnWarning -s exampleSite/ -b http://localhost:8000/ - html-validation: + - name: html-validation image: quay.io/thegeeklab/vnu group: test commands: - vnu --skip-non-html --also-check-css --errors-only --filterfile .vnuignore exampleSite/public - link-validation: + - name: link-validation image: docker.io/lycheeverse/lychee group: test commands: - lychee --no-progress --format detailed exampleSite/content/ README.md - page-validation: + - name: page-validation image: quay.io/thegeeklab/lhci:0.12 group: test commands: