Merge pull request #4621 from fatalbanana/ci_improvements

Minor improvements for CI
rspamd · Sep 30, 2023 · 0e3808e · 0e3808e
2 parents 5fd5976 + 23e831d
commit 0e3808e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/.drone.jsonnet b/.drone.jsonnet
@@ -3,14 +3,15 @@ local docker_pipeline = {
   type: 'docker',
 };
 
+local default_trigger_events_ex_pr = [
+  'push',
+  'tag',
+  'custom',
+];
+
 local default_trigger = {
   trigger: {
-    event: [
-      'push',
-      'tag',
-      'pull_request',
-      'custom',
-    ],
+    event: default_trigger_events_ex_pr + ['pull_request'],
   },
 };
 
@@ -31,8 +32,8 @@ local coveralls_attribs = {
   ],
 };
 
-local coveralls_trigger = {
-  trigger: coveralls_attribs,
+local close_coveralls_trigger = {
+  trigger: coveralls_attribs { status: ['success', 'failure'] },
 };
 
 local coveralls_when = {
@@ -66,6 +67,7 @@ local notify_pipeline = {
     },
   ],
   trigger: {
+    event: default_trigger_events_ex_pr,
     status: [
       'failure',
     ],
@@ -255,7 +257,7 @@ local close_coveralls = {
       },
     },
   ],
-} + coveralls_trigger + docker_pipeline;
+} + close_coveralls_trigger + docker_pipeline;
 
 local noarch_pipeline = {
   name: 'default-noarch',

diff --git a/.drone.yml b/.drone.yml
@@ -203,8 +203,8 @@
       "event": [
          "push",
          "tag",
-         "pull_request",
-         "custom"
+         "custom",
+         "pull_request"
       ]
    },
    "type": "docker",
@@ -420,8 +420,8 @@
       "event": [
          "push",
          "tag",
-         "pull_request",
-         "custom"
+         "custom",
+         "pull_request"
       ]
    },
    "type": "docker",
@@ -462,6 +462,10 @@
       "event": [
          "push",
          "tag"
+      ],
+      "status": [
+         "success",
+         "failure"
       ]
    },
    "type": "docker"
@@ -501,8 +505,8 @@
       "event": [
          "push",
          "tag",
-         "pull_request",
-         "custom"
+         "custom",
+         "pull_request"
       ]
    },
    "type": "docker"
@@ -536,6 +540,11 @@
       }
    ],
    "trigger": {
+      "event": [
+         "push",
+         "tag",
+         "custom"
+      ],
       "status": [
          "failure"
       ]
@@ -544,7 +553,7 @@
 }
 ---
 {
-   "hmac": "e6516adb52533ad1bfedc9ebca429c73cda213b08314d62195f713bb3588b22f",
+   "hmac": "3f01ceb14c7dd3ba2f5343fc52216843f72212e1cb25f944c2366d57e78d2b79",
    "kind": "signature"
 }
 ...