Merge remote-tracking branch 'upstream/main' into test/add-json-test-…

…with-number
grafana · Jun 13, 2022 · 71aa552 · 71aa552
2 parents d8588d4 + 116d61e
commit 71aa552
Show file tree

Hide file tree

Showing 431 changed files with 44,389 additions and 5,651 deletions.
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
@@ -9,7 +9,7 @@ local condition(verb) = {
       [verb]:
         [
           'refs/heads/main',
-          'refs/heads/k??',
+          'refs/heads/k???',
           'refs/tags/v*',
         ],
     },
@@ -359,7 +359,7 @@ local manifest(apps) = pipeline('manifest') {
           dockerfile: 'loki-build-image/Dockerfile',
           username: { from_secret: docker_username_secret.name },
           password: { from_secret: docker_password_secret.name },
-          tags: ['0.20.4'],
+          tags: ['0.21.0'],
           dry_run: false,
         },
       },
@@ -413,6 +413,9 @@ local manifest(apps) = pipeline('manifest') {
         image: 'grafana/jsonnet-build:c8b75df',
         depends_on: ['clone'],
       },
+      make('loki-mixin-check', container=false) {
+        depends_on: ['clone'],
+      },
     ],
   },
 ] + [