From ea9fd8953782dae83f5e1f02cadab7c46eb8fd5f Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Fri, 21 Feb 2020 23:18:40 +0100
Subject: [PATCH] small fixes

---
 .drone.jsonnet | 12 ++++++++----
 .drone.yml     |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index e8268a8..f2fd3a0 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -49,7 +49,6 @@ local PipelineBuild(arch='amd64') = {
     {
       name: 'publish-gitea',
       image: 'plugins/gitea-release',
-      pull: 'always',
       settings: {
         api_key: { from_secret: 'gitea_token' },
         base_url: 'https://gitea.rknet.org',
@@ -87,6 +86,11 @@ local PipelineNotifications(depends_on=[]) = {
         password: { from_secret: 'docker_password' },
         spec: 'manifest.tmpl',
       },
+      when: {
+        status: [
+          'success',
+        ],
+      },
     },
     {
       name: 'readme',
@@ -109,9 +113,9 @@ local PipelineNotifications(depends_on=[]) = {
       name: 'matrix',
       image: 'plugins/matrix',
       settings: {
-        template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}',
-        roomid: { from_secret: 'matrix_roomid' },
         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 }}',
         username: { from_secret: 'matrix_username' },
         password: { from_secret: 'matrix_password' },
       },
@@ -123,7 +127,6 @@ local PipelineNotifications(depends_on=[]) = {
       },
     },
   ],
-  depends_on: depends_on,
   trigger: {
     ref: [
       'refs/heads/master',
@@ -134,6 +137,7 @@ local PipelineNotifications(depends_on=[]) = {
       'failure',
     ],
   },
+  depends_on: depends_on,
 };
 
 [
diff --git a/.drone.yml b/.drone.yml
index 817f597..07c9950 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -42,7 +42,6 @@ steps:
     - refs/tags/**
 
 - name: publish-gitea
-  pull: always
   image: plugins/gitea-release
   settings:
     api_key:
@@ -78,6 +77,9 @@ steps:
     - ${DRONE_TAG%%.*}
     username:
       from_secret: docker_username
+  when:
+    status:
+    - success
 
 - name: readme
   image: sheogorath/readme-to-dockerhub
@@ -124,6 +126,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 6a2f2a70cc4190a5b53d031261940b46d75e758c78da024c6945fe4740d70191
+hmac: 3a7e5e7004cee14e0fe11fce0fc1e7033b5bb525e4066ad4cc10586d2fc54630
 
 ...