From 775d77118921ea506167615238bb04405faaf707 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 22 Aug 2023 09:19:02 +0200 Subject: [PATCH] unify ci config --- .dictionary | 0 .github/settings.yml | 7 ++- .markdownlint.yml | 6 ++ .../{container.yml => build-container.yml} | 13 ++--- .../{release.yml => build-package.yml} | 0 .woodpecker/docs.yml | 55 +++++++++++++++++++ .woodpecker/notify.yml | 10 +--- ...rfile.multiarch => Containerfile.multiarch | 0 README.md | 4 +- 9 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 .dictionary create mode 100644 .markdownlint.yml rename .woodpecker/{container.yml => build-container.yml} (82%) rename .woodpecker/{release.yml => build-package.yml} (100%) create mode 100644 .woodpecker/docs.yml rename Dockerfile.multiarch => Containerfile.multiarch (100%) diff --git a/.dictionary b/.dictionary new file mode 100644 index 0000000..e69de29 diff --git a/.github/settings.yml b/.github/settings.yml index 97ae971..6b78a9e 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -51,8 +51,9 @@ branches: strict: false contexts: - ci/woodpecker/pr/test - - ci/woodpecker/pr/release - - ci/woodpecker/pr/container - enforce_admins: true + - ci/woodpecker/pr/build-binary + - ci/woodpecker/pr/build-container + - ci/woodpecker/pr/docs + enforce_admins: false required_linear_history: true restrictions: null diff --git a/.markdownlint.yml b/.markdownlint.yml new file mode 100644 index 0000000..b59a114 --- /dev/null +++ b/.markdownlint.yml @@ -0,0 +1,6 @@ +--- +default: True +MD013: False +MD041: False +MD004: + style: dash diff --git a/.woodpecker/container.yml b/.woodpecker/build-container.yml similarity index 82% rename from .woodpecker/container.yml rename to .woodpecker/build-container.yml index 4b9f7db..38cde7c 100644 --- a/.woodpecker/container.yml +++ b/.woodpecker/build-container.yml @@ -7,9 +7,9 @@ when: steps: dryrun: - image: quay.io/thegeeklab/drone-docker-buildx:23 + image: quay.io/thegeeklab/wp-docker-buildx:1 settings: - dockerfile: Dockerfile.multiarch + containerfile: Containerfile.multiarch dry_run: true platforms: - linux/amd64 @@ -23,10 +23,10 @@ steps: publish-dockerhub: group: build - image: quay.io/thegeeklab/drone-docker-buildx:23 + image: quay.io/thegeeklab/wp-docker-buildx:1 settings: auto_tag: true - dockerfile: Dockerfile.multiarch + containerfile: Containerfile.multiarch password: from_secret: docker_password platforms: @@ -46,10 +46,10 @@ steps: publish-quay: group: build - image: quay.io/thegeeklab/drone-docker-buildx:23 + image: quay.io/thegeeklab/wp-docker-buildx:1 settings: auto_tag: true - dockerfile: Dockerfile.multiarch + containerfile: Containerfile.multiarch password: from_secret: quay_password platforms: @@ -68,6 +68,5 @@ steps: branch: - ${CI_REPO_DEFAULT_BRANCH} - depends_on: - test diff --git a/.woodpecker/release.yml b/.woodpecker/build-package.yml similarity index 100% rename from .woodpecker/release.yml rename to .woodpecker/build-package.yml diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml new file mode 100644 index 0000000..5509cc0 --- /dev/null +++ b/.woodpecker/docs.yml @@ -0,0 +1,55 @@ +--- +when: + - event: [pull_request, tag] + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + +steps: + markdownlint: + image: quay.io/thegeeklab/markdownlint-cli + commands: + - markdownlint 'README.md' 'CONTRIBUTING.md' + + spellcheck: + image: quay.io/thegeeklab/alpine-tools + commands: + - spellchecker --files 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls + environment: + FORCE_COLOR: "true" + NPM_CONFIG_LOGLEVEL: "error" + + pushrm-dockerhub: + image: docker.io/chko/docker-pushrm:1 + secrets: + - source: docker_password + target: DOCKER_PASS + - source: docker_username + target: DOCKER_USER + environment: + PUSHRM_FILE: README.md + PUSHRM_SHORT: Retry any shell command + PUSHRM_TARGET: ${CI_REPO} + when: + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + status: [success] + + pushrm-quay: + image: docker.io/chko/docker-pushrm:1 + secrets: + - source: quay_token + target: APIKEY__QUAY_IO + environment: + PUSHRM_FILE: README.md + PUSHRM_TARGET: quay.io/${CI_REPO} + when: + - event: [push, manual] + branch: + - ${CI_REPO_DEFAULT_BRANCH} + status: [success] + +depends_on: + - build-binary + - build-container diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml index b0237f8..a851904 100644 --- a/.woodpecker/notify.yml +++ b/.woodpecker/notify.yml @@ -9,7 +9,7 @@ runs_on: [success, failure] steps: matrix: - image: quay.io/thegeeklab/drone-matrix + image: quay.io/thegeeklab/wp-matrix settings: homeserver: from_secret: matrix_homeserver @@ -17,16 +17,10 @@ steps: from_secret: matrix_password roomid: from_secret: matrix_roomid - template: >- - Status: **{{ .Build.Status }}**
- Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}
- Message: {{ .Commit.Message.Title }} username: from_secret: matrix_username when: - status: [success, failure] depends_on: - - test - - container - - release + - docs diff --git a/Dockerfile.multiarch b/Containerfile.multiarch similarity index 100% rename from Dockerfile.multiarch rename to Containerfile.multiarch diff --git a/README.md b/README.md index 6a134ea..9798a95 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # retry -Poor-mans servie synchronizer +Retry any shell command -[![Build Status](https://ci.thegeeklab.de/api/badges/4/status.svg)](https://ci.thegeeklab.de/repos/4) +[![Build Status](https://ci.thegeeklab.de/api/badges/thegeeklab/retry/status.svg)](https://ci.thegeeklab.de/repos/thegeeklab/retry) [![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/retry) [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/retry) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/retry)](https://github.com/thegeeklab/retry/graphs/contributors)