From 4674d7aea94d10682bd0448d07082859729c05a9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 21 Sep 2021 22:36:52 +0200 Subject: [PATCH] ci: switch to drone-matrix plugin --- .drone.jsonnet | 4 +- .drone.yml | 138 ++++++++++++++++++++++++------------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 67222a8..19d438d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -98,11 +98,11 @@ local PipelineNotification = { steps: [ { name: 'matrix', - image: 'plugins/matrix', + image: 'thegeeklab/drone-matrix', settings: { homeserver: { from_secret: 'matrix_homeserver' }, roomid: { from_secret: 'matrix_roomid' }, - template: 'Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}', + template: 'Status: **{{ build.Status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}', username: { from_secret: 'matrix_username' }, password: { from_secret: 'matrix_password' }, }, diff --git a/.drone.yml b/.drone.yml index 77dd33a..d99ecd9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,32 +7,32 @@ platform: arch: amd64 steps: -- name: ansible-later - image: thegeeklab/ansible-later - commands: - - ansible-later - -- name: python-format - image: python:3.9 - commands: - - pip install -qq yapf - - "[ -z \"$(find . -type f -name *.py)\" ] || (yapf -rd ./)" - environment: - PY_COLORS: 1 - -- name: python-flake8 - image: python:3.9 - commands: - - pip install -qq flake8 - - flake8 - environment: - PY_COLORS: 1 + - name: ansible-later + image: thegeeklab/ansible-later + commands: + - ansible-later + + - name: python-format + image: python:3.9 + commands: + - pip install -qq yapf + - "[ -z \"$(find . -type f -name *.py)\" ] || (yapf -rd ./)" + environment: + PY_COLORS: 1 + + - name: python-flake8 + image: python:3.9 + commands: + - pip install -qq flake8 + - flake8 + environment: + PY_COLORS: 1 trigger: ref: - - refs/heads/master - - refs/tags/** - - refs/pull/** + - refs/heads/master + - refs/tags/** + - refs/pull/** --- kind: pipeline @@ -43,39 +43,39 @@ platform: arch: amd64 steps: -- name: generate - image: thegeeklab/ansible-doctor - environment: - ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ - ANSIBLE_DOCTOR_FORCE_OVERWRITE: true - ANSIBLE_DOCTOR_LOG_LEVEL: INFO - ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/ - ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.} - ANSIBLE_DOCTOR_TEMPLATE: hugo-book - -- name: publish - image: plugins/gh-pages - settings: - netrc_machine: gitea.rknet.org - pages_directory: _docs/ - password: - from_secret: gitea_token - remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME} - target_branch: docs - username: - from_secret: gitea_username - when: - ref: - - refs/heads/master + - name: generate + image: thegeeklab/ansible-doctor + environment: + ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ + ANSIBLE_DOCTOR_FORCE_OVERWRITE: true + ANSIBLE_DOCTOR_LOG_LEVEL: INFO + ANSIBLE_DOCTOR_OUTPUT_DIR: _docs/ + ANSIBLE_DOCTOR_ROLE_NAME: ${DRONE_REPO_NAME#*.} + ANSIBLE_DOCTOR_TEMPLATE: hugo-book + + - name: publish + image: plugins/gh-pages + settings: + netrc_machine: gitea.rknet.org + pages_directory: _docs/ + password: + from_secret: gitea_token + remote_url: https://gitea.rknet.org/ansible/${DRONE_REPO_NAME} + target_branch: docs + username: + from_secret: gitea_username + when: + ref: + - refs/heads/master trigger: ref: - - refs/heads/master - - refs/tags/** - - refs/pull/** + - refs/heads/master + - refs/tags/** + - refs/pull/** depends_on: -- linting + - linting --- kind: pipeline @@ -89,32 +89,32 @@ clone: disable: true steps: -- name: matrix - image: plugins/matrix - settings: - homeserver: - from_secret: matrix_homeserver - password: - from_secret: matrix_password - roomid: - from_secret: matrix_roomid - template: "Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}" - username: - from_secret: matrix_username + - name: matrix + image: thegeeklab/drone-matrix + settings: + homeserver: + from_secret: matrix_homeserver + password: + 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 }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}" + username: + from_secret: matrix_username trigger: ref: - - refs/heads/master - - refs/tags/** + - refs/heads/master + - refs/tags/** status: - - success - - failure + - success + - failure depends_on: -- documentation + - documentation --- kind: signature -hmac: 9f80ffe8270136965a3b8e387cd13ac683f5ceb3f042724fcfd97735c2b1bed0 +hmac: 7a57407155f3e5c008cdec500b1a88dfed9152a5ea59f72cf71ed4778c3c4755 ...