fix drone yaml format and switch to drone-matrix plugin (#6)

* fix drone yaml format and switch to drone-matrix plugin

* fix matrix notification template

.drone.jsonnet

@@ -361,11 +361,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,96 +1,106 @@
 ---
-image_pull_secrets:
-- docker_config
 kind: pipeline
 name: test
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: staticcheck
+    image: golang:1.16
+    commands:
       - go run honnef.co/go/tools/cmd/staticcheck ./...
-  image: golang:1.16
-  name: staticcheck
     volumes:
       - name: gopath
         path: /go
-- commands:
+
+  - name: lint
+    image: golang:1.16
+    commands:
       - go run golang.org/x/lint/golint -set_exit_status ./...
-  image: golang:1.16
-  name: lint
     volumes:
       - name: gopath
         path: /go
-- commands:
+
+  - name: vet
+    image: golang:1.16
+    commands:
       - go vet ./...
-  image: golang:1.16
-  name: vet
     volumes:
       - name: gopath
         path: /go
-- commands:
+
+  - name: test
+    image: golang:1.16
+    commands:
       - go test -cover ./...
-  image: golang:1.16
-  name: test
     volumes:
       - name: gopath
         path: /go
+
+volumes:
+  - name: gopath
+    temp: {}
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
-volumes:
+
-- name: gopath
-  temp: {}
 ---
-depends_on:
-- test
-image_pull_secrets:
-- docker_config
 kind: pipeline
 name: build-binaries
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: build
-  - '[ -z "${DRONE_TAG}" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}'
+    image: techknowlogick/xgo:go-1.16.x
+    commands:
+      - "[ -z \"${DRONE_TAG}\" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}"
       - mkdir -p release/
-  - cd cmd/drone-matrix && xgo -ldflags "-s -w -X main.version=$BUILD_VERSION" -tags
+      - cd cmd/drone-matrix && xgo -ldflags "-s -w -X main.version=$BUILD_VERSION" -tags netgo -targets 'linux/amd64,linux/arm-6,linux/arm-7,linux/arm64' -out drone-matrix .
-    netgo -targets 'linux/amd64,linux/arm-6,linux/arm-7,linux/arm64' -out drone-matrix
-    .
       - mv /build/* /drone/src/release/
       - ls -l /drone/src/release/
-  image: techknowlogick/xgo:go-1.16.x
+
-  name: build
+  - name: executable
-- commands:
-  - $(find release/ -executable -type f | grep drone-matrix-linux-amd64) --help
     image: alpine
-  name: executable
+    commands:
-- commands:
+      - $(find release/ -executable -type f | grep drone-matrix-linux-amd64) --help
+
+  - name: compress
+    image: alpine
+    commands:
       - apk add upx
       - find release/ -maxdepth 1 -executable -type f -exec upx {} \;
       - ls -lh release/
+
+  - name: checksum
     image: alpine
-  name: compress
+    commands:
-- commands:
       - cd release/ && sha256sum * > sha256sum.txt
-  image: alpine
+
-  name: checksum
+  - name: changelog-generate
-- commands:
-  - git fetch -tq
-  - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased
-    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
-- image: plugins/github-release
+    image: plugins/github-release
-  name: publish
     settings:
       api_key:
         from_secret: github_token
@@ -102,32 +112,36 @@ steps:
     when:
       ref:
         - refs/tags/**
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- test
+  - test
-image_pull_secrets:
+
-- docker_config
+---
 kind: pipeline
 name: build-container-amd64
+
 platform:
-  arch: amd64
   os: linux
+  arch: amd64
+
 steps:
-- commands:
+  - name: build
-  - '[ -z "${DRONE_TAG}" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}'
-  - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/amd64/drone-matrix
-    ./cmd/drone-matrix
     image: golang:1.16
-  name: build
+    commands:
-- depends_on:
+      - "[ -z \"${DRONE_TAG}\" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}"
-  - build
+      - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/amd64/drone-matrix ./cmd/drone-matrix
+
+  - name: dryrun
     image: thegeeklab/drone-docker:19
-  name: dryrun
     settings:
       config:
         from_secret: docker_config
@@ -141,10 +155,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
@@ -160,10 +175,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
@@ -180,32 +196,38 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+    depends_on:
+      - dryrun
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- test
+  - test
-image_pull_secrets:
+
-- docker_config
+---
 kind: pipeline
 name: build-container-arm64
+
 platform:
-  arch: arm64
   os: linux
+  arch: arm64
+
 steps:
-- commands:
+  - name: build
-  - '[ -z "${DRONE_TAG}" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}'
-  - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm64/drone-matrix
-    ./cmd/drone-matrix
     image: golang:1.16
-  name: build
+    commands:
-- depends_on:
+      - "[ -z \"${DRONE_TAG}\" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}"
-  - build
+      - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm64/drone-matrix ./cmd/drone-matrix
+
+  - name: dryrun
     image: thegeeklab/drone-docker:19
-  name: dryrun
     settings:
       config:
         from_secret: docker_config
@@ -219,10 +241,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
@@ -238,10 +261,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
@@ -258,32 +282,38 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+    depends_on:
+      - dryrun
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- test
+  - test
-image_pull_secrets:
+
-- docker_config
+---
 kind: pipeline
 name: build-container-arm
+
 platform:
-  arch: arm
   os: linux
+  arch: arm
+
 steps:
-- commands:
+  - name: build
-  - '[ -z "${DRONE_TAG}" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}'
-  - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm/drone-matrix
-    ./cmd/drone-matrix
     image: golang:1.16
-  name: build
+    commands:
-- depends_on:
+      - "[ -z \"${DRONE_TAG}\" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}"
-  - build
+      - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm/drone-matrix ./cmd/drone-matrix
+
+  - name: dryrun
     image: thegeeklab/drone-docker:19
-  name: dryrun
     settings:
       config:
         from_secret: docker_config
@@ -297,10 +327,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
@@ -316,10 +347,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
@@ -336,40 +368,49 @@ steps:
       ref:
         - refs/heads/main
         - refs/tags/**
+    depends_on:
+      - dryrun
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
-concurrency:
-  limit: 1
 depends_on:
-- build-binaries
+  - test
-- 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: markdownlint
-  - markdownlint 'docs/content/**/*.md' 'README.md' 'CONTRIBUTING.md'
     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/**/*.md' 'README.md' 'CONTRIBUTING.md' -d .dictionary
+      - spellchecker --files '_docs/**/*.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: publish
-- image: plugins/gh-pages
+    image: plugins/gh-pages
-  name: publish
     settings:
       pages_directory: _docs/
       password:
@@ -380,24 +421,30 @@ steps:
     when:
       ref:
         - refs/heads/main
+
 trigger:
   ref:
     - refs/heads/main
     - refs/tags/**
     - refs/pull/**
----
+
 depends_on:
-- docs
+  - build-binaries
-image_pull_secrets:
+  - build-container-amd64
-- docker_config
+  - 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
@@ -409,8 +456,9 @@ steps:
     when:
       status:
         - success
-- image: plugins/manifest
+
-  name: manifest-quay
+  - name: manifest-quay
+    image: plugins/manifest
     settings:
       auto_tag: true
       ignore_missing: true
@@ -422,7 +470,10 @@ steps:
     when:
       status:
         - success
-- environment:
+
+  - name: pushrm-dockerhub
+    image: chko/docker-pushrm:1
+    environment:
       DOCKER_PASS:
         from_secret: docker_password
       DOCKER_USER:
@@ -430,23 +481,23 @@ steps:
       PUSHRM_FILE: README.md
       PUSHRM_SHORT: Drone plugin to to send messages to Matrix
       PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
-  image: chko/docker-pushrm:1
-  name: pushrm-dockerhub
     when:
       status:
         - success
-- environment:
+
+  - name: pushrm-quay
+    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
     when:
       status:
         - success
-- image: plugins/matrix
+
-  name: matrix
+  - name: matrix
+    image: thegeeklab/drone-matrix
     settings:
       homeserver:
         from_secret: matrix_homeserver
@@ -454,15 +505,17 @@ 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
+
+image_pull_secrets:
+  - docker_config
+
 trigger:
   ref:
     - refs/heads/main
@@ -470,8 +523,12 @@ trigger:
   status:
     - success
     - failure
+
+depends_on:
+  - docs
+
 ---
 kind: signature
-hmac: 2a628319305f254a9f63d020eb220a5154b770c0da48a8c33ab944df476abade
+hmac: 187e914ad618a0d2d770ffaf2438889bb98bb6eb2c65559347afcbc95744ae4b
 
 ...

_docs/_index.md

@@ -45,7 +45,7 @@ docker run --rm \
   -e PLUGIN_PASSWORD=p455w0rd \
   -v $(pwd):$(pwd) \
   -w $(pwd) \
-  plugins/matrix
+  thegeeklab/drone-matrix
 ```
 
 ### Parameters