From 3d0d38fd64fc497e3e1e176ce6553ce08eae5b99 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 5 May 2020 19:38:09 +0200 Subject: [PATCH] CircleCI: Enable plug-in signing (#24240) * CircleCI: Include signed manifest when building plug-ins (cherry picked from commit a87381ece659de50c1572729248fbcfb4879801e) --- .circleci/config.yml | 8 +++++++- plugins-bundled/internal/input-datasource/src/plugin.json | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea056ad9b6e..1a363b68def 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,7 +192,13 @@ jobs: - run: name: Build internal Grafana plug-ins command: | - /tmp/grabpl build-plugins --jobs 2 --edition << parameters.edition >> + if [[ -n "$CIRCLE_PR_NUMBER" ]]; then + # This is a forked PR, so don't sign as it requires an API secret + /tmp/grabpl build-plugins --jobs 2 --edition << parameters.edition >> + else + export GRAFANA_API_KEY=$GRAFANA_COM_API_KEY + /tmp/grabpl build-plugins --jobs 2 --edition << parameters.edition >> --sign --signing-admin + fi - run: name: Move artifacts command: | diff --git a/plugins-bundled/internal/input-datasource/src/plugin.json b/plugins-bundled/internal/input-datasource/src/plugin.json index f5616514238..5cd72d9f1c7 100644 --- a/plugins-bundled/internal/input-datasource/src/plugin.json +++ b/plugins-bundled/internal/input-datasource/src/plugin.json @@ -7,6 +7,7 @@ "metrics": true, "info": { + "version": "1.0.0", "description": "Data source that supports manual table & CSV input", "author": { "name": "Grafana Labs",