From cbea04f337bc847264c343f9c0f24eccb199fc0f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 22 Aug 2023 09:46:02 +0200 Subject: [PATCH] unify ci --- .github/settings.yml | 2 +- .woodpecker/build-container.yml | 6 +++--- .woodpecker/{build-binary.yml => build-package.yml} | 2 +- .woodpecker/docs.yml | 4 ++-- .woodpecker/notify.yml | 6 +----- 5 files changed, 8 insertions(+), 12 deletions(-) rename .woodpecker/{build-binary.yml => build-package.yml} (95%) diff --git a/.github/settings.yml b/.github/settings.yml index 0707ae6..ed804b2 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -52,7 +52,7 @@ branches: strict: false contexts: - ci/woodpecker/pr/test - - ci/woodpecker/pr/build-binary + - ci/woodpecker/pr/build-package - ci/woodpecker/pr/build-container - ci/woodpecker/pr/docs enforce_admins: false diff --git a/.woodpecker/build-container.yml b/.woodpecker/build-container.yml index 8f39dab..7303444 100644 --- a/.woodpecker/build-container.yml +++ b/.woodpecker/build-container.yml @@ -7,7 +7,7 @@ when: steps: dryrun: - image: quay.io/thegeeklab/wp-docker-buildx + image: quay.io/thegeeklab/wp-docker-buildx:1 settings: containerfile: Containerfile.multiarch dry_run: true @@ -21,7 +21,7 @@ steps: publish-dockerhub: group: container - image: quay.io/thegeeklab/wp-docker-buildx + image: quay.io/thegeeklab/wp-docker-buildx:1 settings: auto_tag: true containerfile: Containerfile.multiarch @@ -42,7 +42,7 @@ steps: publish-quay: group: container - image: quay.io/thegeeklab/wp-docker-buildx + image: quay.io/thegeeklab/wp-docker-buildx:1 settings: auto_tag: true containerfile: Containerfile.multiarch diff --git a/.woodpecker/build-binary.yml b/.woodpecker/build-package.yml similarity index 95% rename from .woodpecker/build-binary.yml rename to .woodpecker/build-package.yml index 8c5bbd3..31b79bc 100644 --- a/.woodpecker/build-binary.yml +++ b/.woodpecker/build-package.yml @@ -13,7 +13,7 @@ steps: - make release executable: - image: docker.io/library/alpine + image: quay.io/thegeeklab/alpine-tools commands: - $(find dist/ -executable -type f -iname ${CI_REPO_NAME}-linux-amd64) --help diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index 0709a97..d58861c 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -14,7 +14,7 @@ steps: spellcheck: image: quay.io/thegeeklab/alpine-tools commands: - - spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions + - spellchecker --files '_docs/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls environment: FORCE_COLOR: "true" NPM_CONFIG_LOGLEVEL: "error" @@ -68,5 +68,5 @@ steps: status: [success] depends_on: - - build-binary + - build-package - build-container diff --git a/.woodpecker/notify.yml b/.woodpecker/notify.yml index 9028f78..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,10 +17,6 @@ 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: