ci: switch to drone-matrix plugin (#169)

.drone.jsonnet

@@ -477,11 +477,11 @@ local PipelineNotifications = {
     },
     {
       name: 'matrix',
-      image: 'plugins/matrix',
+      image: 'thegeeklab/drone-matrix',
       settings: {
         homeserver: { from_secret: 'matrix_homeserver' },
         roomid: { from_secret: 'matrix_roomid' },
-        template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}',
+        template: 'Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}) ({{ build.Branch }}) by {{ commit.Author }}<br/> Message: {{ commit.Message }}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },

.drone.yml

@@ -1,11 +1,15 @@
 ---
 kind: pipeline
 name: lint
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: yapf
+    image: python:3.9
+    commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry config experimental.new-installer false
@@ -13,9 +17,10 @@ steps:
       - poetry run yapf -dr ./dockertidy
     environment:
       PY_COLORS: 1
+
+  - name: flake8
     image: python:3.9
-  name: yapf
+    commands:
-- commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry config experimental.new-installer false
@@ -23,107 +28,119 @@ steps:
       - poetry run flake8 ./dockertidy
     environment:
       PY_COLORS: 1
-  image: python:3.9
+
-  name: flake8
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
+
 ---
-depends_on:
-- lint
 kind: pipeline
 name: test
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: fetch
+    image: python:3.9
+    commands:
       - git fetch -tq
-  image: python:3.9
+
-  name: fetch
+  - name: python36-pytest
-- commands:
-  - pip install poetry poetry-dynamic-versioning -qq
-  - poetry config experimental.new-installer false
-  - poetry install
-  - poetry run pytest dockertidy --cov=dockertidy --cov-append --no-cov-on-fail
-  - poetry version
-  - poetry run docker-tidy --help
-  depends_on:
-  - fetch
-  environment:
-    PY_COLORS: 1
     image: python:3.6
-  name: python36-pytest
+    commands:
-- commands:
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry config experimental.new-installer false
       - poetry install
       - poetry run pytest dockertidy --cov=dockertidy --cov-append --no-cov-on-fail
       - poetry version
       - poetry run docker-tidy --help
-  depends_on:
-  - fetch
     environment:
       PY_COLORS: 1
+    depends_on:
+      - fetch
+
+  - name: python37-pytest
     image: python:3.7
-  name: python37-pytest
+    commands:
-- commands:
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry config experimental.new-installer false
       - poetry install
       - poetry run pytest dockertidy --cov=dockertidy --cov-append --no-cov-on-fail
       - poetry version
       - poetry run docker-tidy --help
-  depends_on:
-  - fetch
     environment:
       PY_COLORS: 1
+    depends_on:
+      - fetch
+
+  - name: python38-pytest
     image: python:3.8
-  name: python38-pytest
+    commands:
-- commands:
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry config experimental.new-installer false
       - poetry install
       - poetry run pytest dockertidy --cov=dockertidy --cov-append --no-cov-on-fail
       - poetry version
       - poetry run docker-tidy --help
-  depends_on:
-  - fetch
     environment:
       PY_COLORS: 1
+    depends_on:
+      - fetch
+
+  - name: python39-pytest
     image: python:3.9
-  name: python39-pytest
+    commands:
-- commands:
+      - pip install poetry poetry-dynamic-versioning -qq
+      - poetry config experimental.new-installer false
+      - poetry install
+      - poetry run pytest dockertidy --cov=dockertidy --cov-append --no-cov-on-fail
+      - poetry version
+      - poetry run docker-tidy --help
+    environment:
+      PY_COLORS: 1
+    depends_on:
+      - fetch
+
+  - name: codecov
+    image: python:3.9
+    commands:
       - pip install codecov -qq
       - codecov --required -X gcov
+    environment:
+      CODECOV_TOKEN:
+        from_secret: codecov_token
+      PY_COLORS: 1
     depends_on:
       - python36-pytest
       - python37-pytest
       - python38-pytest
       - python39-pytest
-  environment:
+
-    CODECOV_TOKEN:
-      from_secret: codecov_token
-    PY_COLORS: 1
-  image: python:3.9
-  name: codecov
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- test
+  - lint
+
+---
 kind: pipeline
 name: security
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: bandit
+    image: python:3.9
+    commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry config experimental.new-installer false
@@ -131,45 +148,51 @@ steps:
       - poetry run bandit -r ./dockertidy -x ./dockertidy/test
     environment:
       PY_COLORS: 1
-  image: python:3.9
+
-  name: bandit
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- security
+  - test
+
+---
 kind: pipeline
 name: build-package
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: build
+    image: python:3.9
+    commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry build
-  image: python:3.9
+
-  name: build
+  - name: checksum
-- commands:
-  - cd dist/ && sha256sum * > ../sha256sum.txt
     image: alpine
-  name: checksum
+    commands:
-- commands:
+      - cd dist/ && sha256sum * > ../sha256sum.txt
-  - git fetch -tq
+
-  - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased
+  - name: changelog-generate
-    unreleased}
     image: thegeeklab/git-chglog
-  name: changelog-generate
+    commands:
-- commands:
+      - git fetch -tq
+      - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
+
+  - name: changelog-format
+    image: thegeeklab/alpine-tools
+    commands:
       - prettier CHANGELOG.md
       - prettier -w CHANGELOG.md
-  image: thegeeklab/alpine-tools
+
-  name: changelog-format
+  - name: publish-github
-- image: plugins/github-release
+    image: plugins/github-release
-  name: publish-github
     settings:
       api_key:
         from_secret: github_token
@@ -182,7 +205,10 @@ steps:
     when:
       ref:
         - refs/tags/**
-- commands:
+
+  - name: publish-pypi
+    image: python:3.9
+    commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry publish -n
@@ -191,35 +217,37 @@ steps:
         from_secret: pypi_password
       POETRY_HTTP_BASIC_PYPI_USERNAME:
         from_secret: pypi_username
-  image: python:3.9
-  name: publish-pypi
     when:
       ref:
         - refs/tags/**
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- security
+  - security
+
+---
 kind: pipeline
 name: build-container-amd64
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: build
+    image: python:3.9
+    commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry build
-  image: python:3.9
+
-  name: build
+  - name: dryrun
-- depends_on:
-  - build
     image: thegeeklab/drone-docker:19
-  name: dryrun
     settings:
       dockerfile: docker/Dockerfile.amd64
       dry_run: true
@@ -231,10 +259,11 @@ steps:
     when:
       ref:
         - refs/pull/**
-- depends_on:
+    depends_on:
-  - dryrun
+      - build
+
+  - name: publish-dockerhub
     image: thegeeklab/drone-docker:19
-  name: publish-dockerhub
     settings:
       auto_tag: true
       auto_tag_suffix: amd64
@@ -248,10 +277,11 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
-- depends_on:
+    depends_on:
       - dryrun
+
+  - name: publish-quay
     image: thegeeklab/drone-docker:19
-  name: publish-quay
     settings:
       auto_tag: true
       auto_tag_suffix: amd64
@@ -266,30 +296,36 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+    depends_on:
+      - dryrun
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- security
+  - security
+
+---
 kind: pipeline
 name: build-container-arm64
+
 platform:
-  arch: arm64
   os: linux
+  arch: arm64
+
 steps:
-- commands:
+  - name: build
+    image: python:3.9
+    commands:
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry build
-  image: python:3.9
+
-  name: build
+  - name: dryrun
-- depends_on:
-  - build
     image: thegeeklab/drone-docker:19
-  name: dryrun
     settings:
       dockerfile: docker/Dockerfile.arm64
       dry_run: true
@@ -301,10 +337,11 @@ steps:
     when:
       ref:
         - refs/pull/**
-- depends_on:
+    depends_on:
-  - dryrun
+      - build
+
+  - name: publish-dockerhub
     image: thegeeklab/drone-docker:19
-  name: publish-dockerhub
     settings:
       auto_tag: true
       auto_tag_suffix: arm64
@@ -318,10 +355,11 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
-- depends_on:
+    depends_on:
       - dryrun
+
+  - name: publish-quay
     image: thegeeklab/drone-docker:19
-  name: publish-quay
     settings:
       auto_tag: true
       auto_tag_suffix: arm64
@@ -336,34 +374,39 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+    depends_on:
+      - dryrun
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- security
+  - security
+
+---
 kind: pipeline
 name: build-container-arm
+
 platform:
-  arch: arm
   os: linux
+  arch: arm
+
 steps:
-- commands:
+  - name: build
-  - apk add -Uq --no-cache build-base openssl-dev libffi-dev musl-dev python3-dev
+    image: python:3.9-alpine
-    git cargo
+    commands:
+      - apk add -Uq --no-cache build-base openssl-dev libffi-dev musl-dev python3-dev git cargo
       - git fetch -tq
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry build
     environment:
       CARGO_NET_GIT_FETCH_WITH_CLI: true
-  image: python:3.9-alpine
+
-  name: build
+  - name: dryrun
-- depends_on:
-  - build
     image: thegeeklab/drone-docker:19
-  name: dryrun
     settings:
       dockerfile: docker/Dockerfile.arm
       dry_run: true
@@ -375,10 +418,11 @@ steps:
     when:
       ref:
         - refs/pull/**
-- depends_on:
+    depends_on:
-  - dryrun
+      - build
+
+  - name: publish-dockerhub
     image: thegeeklab/drone-docker:19
-  name: publish-dockerhub
     settings:
       auto_tag: true
       auto_tag_suffix: arm
@@ -392,10 +436,11 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
-- depends_on:
+    depends_on:
       - dryrun
+
+  - name: publish-quay
     image: thegeeklab/drone-docker:19
-  name: publish-quay
     settings:
       auto_tag: true
       auto_tag_suffix: arm
@@ -410,66 +455,77 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+    depends_on:
+      - dryrun
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
-concurrency:
-  limit: 1
 depends_on:
-- build-package
+  - security
-- build-container-amd64
+
-- build-container-arm64
+---
-- build-container-arm
 kind: pipeline
 name: docs
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
+concurrency:
+  limit: 1
+
 steps:
-- commands:
+  - name: assets
-  - make doc
     image: thegeeklab/alpine-tools
-  name: assets
+    commands:
-- commands:
+      - make doc
-  - markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'
+
+  - name: markdownlint
     image: thegeeklab/markdownlint-cli
-  name: markdownlint
+    commands:
-- commands:
+      - markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'
+
+  - name: spellcheck
+    image: node:lts-alpine
+    commands:
       - npm install -g spellchecker-cli
-  - spellchecker --files 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary
+      - spellchecker --files 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary -p spell indefinite-article syntax-urls --no-suggestions
-    -p spell indefinite-article syntax-urls --no-suggestions
     environment:
       FORCE_COLOR: true
       NPM_CONFIG_LOGLEVEL: error
-  image: node:lts-alpine
+
-  name: spellcheck
+  - name: testbuild
-- commands:
-  - hugo -s docs/ -b http://localhost/
     image: thegeeklab/hugo:0.83.1
-  name: testbuild
+    commands:
-- commands:
+      - hugo -s docs/ -b http://localhost/
+
+  - name: link-validation
+    image: thegeeklab/link-validator
+    commands:
       - link-validator -ro
     environment:
       LINK_VALIDATOR_BASE_DIR: docs/public
-  image: thegeeklab/link-validator
+
-  name: link-validation
+  - name: build
-- commands:
-  - hugo -s docs/
     image: thegeeklab/hugo:0.83.1
-  name: build
+    commands:
-- commands:
+      - hugo -s docs/
+
+  - name: beautify
+    image: node:lts-alpine
+    commands:
       - npm install -g js-beautify
       - html-beautify -r -f 'docs/public/**/*.html'
     environment:
       FORCE_COLOR: true
       NPM_CONFIG_LOGLEVEL: error
-  image: node:lts-alpine
+
-  name: beautify
+  - name: publish
-- image: plugins/s3-sync
+    image: plugins/s3-sync
-  name: publish
     settings:
       access_key:
         from_secret: s3_access_key
@@ -486,22 +542,30 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- docs
+  - build-package
+  - build-container-amd64
+  - build-container-arm64
+  - build-container-arm
+
+---
 kind: pipeline
 name: notifications
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- image: plugins/manifest
+  - name: manifest-dockerhub
-  name: manifest-dockerhub
+    image: plugins/manifest
     settings:
       auto_tag: true
       ignore_missing: true
@@ -513,8 +577,9 @@ steps:
     when:
       status:
         - success
-- image: plugins/manifest
+
-  name: manifest-quay
+  - name: manifest-quay
+    image: plugins/manifest
     settings:
       auto_tag: true
       ignore_missing: true
@@ -526,7 +591,11 @@ steps:
     when:
       status:
         - success
-- environment:
+
+  - name: pushrm-dockerhub
+    pull: always
+    image: chko/docker-pushrm:1
+    environment:
       DOCKER_PASS:
         from_secret: docker_password
       DOCKER_USER:
@@ -534,25 +603,24 @@ steps:
       PUSHRM_FILE: README.md
       PUSHRM_SHORT: Keep docker hosts tidy
       PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
-  image: chko/docker-pushrm:1
-  name: pushrm-dockerhub
-  pull: always
     when:
       status:
         - success
-- environment:
+
+  - name: pushrm-quay
+    pull: always
+    image: chko/docker-pushrm:1
+    environment:
       APIKEY__QUAY_IO:
         from_secret: quay_token
       PUSHRM_FILE: README.md
       PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
-  image: chko/docker-pushrm:1
-  name: pushrm-quay
-  pull: always
     when:
       status:
         - success
-- image: plugins/matrix
+
-  name: matrix
+  - name: matrix
+    image: thegeeklab/drone-matrix
     settings:
       homeserver:
         from_secret: matrix_homeserver
@@ -560,15 +628,14 @@ steps:
         from_secret: matrix_password
       roomid:
         from_secret: matrix_roomid
-    template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name
+      template: "Status: **{{ build.Status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}) ({{ build.Branch }}) by {{ commit.Author }}<br/> Message: {{ commit.Message }}"
-      }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message:
-      {{ build.message }}'
       username:
         from_secret: matrix_username
     when:
       status:
         - success
         - failure
+
 trigger:
   ref:
     - refs/heads/main
@@ -576,8 +643,12 @@ trigger:
   status:
     - success
     - failure
+
+depends_on:
+  - docs
+
 ---
 kind: signature
-hmac: 4ff81da3abd0a070d654cd23a42d7c19dfd6854a0b1c23b7a7042cd99c87c662
+hmac: 4f6f2317eec509d0c835f0406fab12b70d847d34b90c9e7dcf6708b11c317f6d
 
 ...