Merge pull request #57 from grafana/chore/regenerate-drone-yml

Drone: Sync Jsonnet and YAML
grafana · Oct 7, 2021 · e60928d · e60928d
2 parents 57b516b + 0d22117
commit e60928d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 37 deletions.
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -8,10 +8,10 @@ local pipeline = {
 };
 
 local step = {
-  make(target):: {
+  make(target, commands=[]):: {
     name: 'make-%s' % target,
     image: image,
-    commands: ['make %s' % target],
+    commands: commands + ['make %s' % target],
   },
 };
 
@@ -21,6 +21,10 @@ local step = {
       step.make('mod-check'),
       step.make('lint'),
       step.make('test'),
+      step.make('check-protos', commands=[
+        'apt-get update && apt-get -y install unzip',
+        'go mod vendor',
+      ]),
     ],
   },
 ]
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -1,42 +1,42 @@
 ---
 {
-  "kind": "pipeline",
-  "name": "validate-pr",
-  "steps": [
-    {
-      "commands": [
-          "make mod-check"
-      ],
-      "image": "golang:1.16.7",
-      "name": "make-mod-check"
-    },
-    {
-      "commands": [
-          "make lint"
-      ],
-      "image": "golang:1.16.7",
-      "name": "make-lint"
-    },
-    {
-      "commands": [
-          "make test"
-      ],
-      "image": "golang:1.16.7",
-      "name": "make-test"
-    },
-    {
-      "commands": [
-          "apt-get update && apt-get -y install unzip",
-          "go mod vendor",
-          "make check-protos"
-      ],
-      "image": "golang:1.16.7",
-      "name": "check-protos"
-    }
-  ]
+   "kind": "pipeline",
+   "name": "validate-pr",
+   "steps": [
+      {
+         "commands": [
+            "make mod-check"
+         ],
+         "image": "golang:1.16.7",
+         "name": "make-mod-check"
+      },
+      {
+         "commands": [
+            "make lint"
+         ],
+         "image": "golang:1.16.7",
+         "name": "make-lint"
+      },
+      {
+         "commands": [
+            "make test"
+         ],
+         "image": "golang:1.16.7",
+         "name": "make-test"
+      },
+      {
+         "commands": [
+            "apt-get update && apt-get -y install unzip",
+            "go mod vendor",
+            "make check-protos"
+         ],
+         "image": "golang:1.16.7",
+         "name": "make-check-protos"
+      }
+   ]
 }
 ---
 kind: signature
-hmac: 893175120deb8b657ff638a1e3175b3f9e15b328788d0a83702d5bb4d03bdb17
+hmac: 3b4342022f2635d86f61ee26f7c1dfa66399233b91ea7b2d730a97b8d0a469e6
 
 ...