mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Packages: Bundle plugins (#23787)
* Add manifest for external plugins * CircleCI: Build internal plug-ins * CircleCI: Package internal and external plug-ins Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
parent
66e5a1c0b3
commit
76b184b93c
@ -50,7 +50,7 @@ commands:
|
|||||||
- run:
|
- run:
|
||||||
name: "Install Grafana build pipeline tool"
|
name: "Install Grafana build pipeline tool"
|
||||||
command: |
|
command: |
|
||||||
VERSION=0.2.11
|
VERSION=0.2.12
|
||||||
curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl
|
curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl
|
||||||
chmod +x grabpl
|
chmod +x grabpl
|
||||||
mv grabpl /tmp
|
mv grabpl /tmp
|
||||||
@ -166,6 +166,47 @@ jobs:
|
|||||||
command: ./scripts/ci-job-succeeded.sh
|
command: ./scripts/ci-job-succeeded.sh
|
||||||
when: on_success
|
when: on_success
|
||||||
|
|
||||||
|
build-plugins:
|
||||||
|
description: "Build internal Grafana plug-ins"
|
||||||
|
parameters:
|
||||||
|
edition:
|
||||||
|
type: string
|
||||||
|
executor: grafana-build
|
||||||
|
steps:
|
||||||
|
- run:
|
||||||
|
name: Exit if enterprise and forked PR
|
||||||
|
command: |
|
||||||
|
if [[ "<< parameters.edition >>" == "enterprise" && -n "$CIRCLE_PR_NUMBER" ]]; then
|
||||||
|
echo "Nothing to do for forked PRs, so marking this step successful"
|
||||||
|
circleci step halt
|
||||||
|
fi
|
||||||
|
- checkout
|
||||||
|
- run:
|
||||||
|
name: CI job started
|
||||||
|
command: ./scripts/ci-job-started.sh
|
||||||
|
- install-grabpl
|
||||||
|
- run:
|
||||||
|
name: Build internal Grafana plug-ins
|
||||||
|
command: |
|
||||||
|
/tmp/grabpl build-plugins --jobs 2 --edition << parameters.edition >>
|
||||||
|
- run:
|
||||||
|
name: Move artifacts
|
||||||
|
command: |
|
||||||
|
mkdir -p << parameters.edition >>/plugins-bundled
|
||||||
|
mv plugins-bundled/dist << parameters.edition >>/plugins-bundled/
|
||||||
|
- persist_to_workspace:
|
||||||
|
root: .
|
||||||
|
paths:
|
||||||
|
- << parameters.edition >>/plugins-bundled/dist/*
|
||||||
|
- run:
|
||||||
|
name: CI job failed
|
||||||
|
command: ./scripts/ci-job-failed.sh
|
||||||
|
when: on_fail
|
||||||
|
- run:
|
||||||
|
name: CI job succeeded
|
||||||
|
command: ./scripts/ci-job-succeeded.sh
|
||||||
|
when: on_success
|
||||||
|
|
||||||
build-release-publisher:
|
build-release-publisher:
|
||||||
description: "Build release-publisher"
|
description: "Build release-publisher"
|
||||||
executor: go
|
executor: go
|
||||||
@ -1006,6 +1047,13 @@ workflows:
|
|||||||
requires:
|
requires:
|
||||||
- test-backend
|
- test-backend
|
||||||
- test-frontend
|
- test-frontend
|
||||||
|
- build-plugins:
|
||||||
|
# No filters, meaning this job runs for all branches
|
||||||
|
name: build-oss-plugins
|
||||||
|
edition: oss
|
||||||
|
requires:
|
||||||
|
- test-backend
|
||||||
|
- test-frontend
|
||||||
- build-backend:
|
- build-backend:
|
||||||
filters: *filter-master-or-release
|
filters: *filter-master-or-release
|
||||||
name: build-enterprise-backend-armv6
|
name: build-enterprise-backend-armv6
|
||||||
@ -1085,6 +1133,13 @@ workflows:
|
|||||||
requires:
|
requires:
|
||||||
- test-backend
|
- test-backend
|
||||||
- test-frontend
|
- test-frontend
|
||||||
|
- build-plugins:
|
||||||
|
# No filters, meaning this job runs for all branches
|
||||||
|
name: build-enterprise-plugins
|
||||||
|
edition: enterprise
|
||||||
|
requires:
|
||||||
|
- test-backend
|
||||||
|
- test-frontend
|
||||||
- build-release-publisher:
|
- build-release-publisher:
|
||||||
filters: *filter-master-or-release
|
filters: *filter-master-or-release
|
||||||
# No filters, meaning this job runs for all branches
|
# No filters, meaning this job runs for all branches
|
||||||
@ -1128,6 +1183,7 @@ workflows:
|
|||||||
- test-frontend
|
- test-frontend
|
||||||
- codespell
|
- codespell
|
||||||
- shellcheck
|
- shellcheck
|
||||||
|
- build-oss-plugins
|
||||||
- package-enterprise:
|
- package-enterprise:
|
||||||
# No filters, meaning this job runs for all branches
|
# No filters, meaning this job runs for all branches
|
||||||
requires:
|
requires:
|
||||||
@ -1145,6 +1201,7 @@ workflows:
|
|||||||
- test-frontend
|
- test-frontend
|
||||||
- codespell
|
- codespell
|
||||||
- shellcheck
|
- shellcheck
|
||||||
|
- build-enterprise-plugins
|
||||||
- build-oss-windows-installer:
|
- build-oss-windows-installer:
|
||||||
# No filters, meaning this job runs for all branches
|
# No filters, meaning this job runs for all branches
|
||||||
requires:
|
requires:
|
||||||
|
9
plugins-bundled/external.json
Normal file
9
plugins-bundled/external.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"plugins": [
|
||||||
|
{
|
||||||
|
"name": "gel",
|
||||||
|
"version": "0.2.0",
|
||||||
|
"checksum": "059e06b927ab5ff0d75a1719a0a669ca3502b9a130f54261b196f4b23b775a61"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -19,5 +19,8 @@
|
|||||||
"@grafana/data": "^7.0.0-pre",
|
"@grafana/data": "^7.0.0-pre",
|
||||||
"@grafana/ui": "^7.0.0-pre",
|
"@grafana/ui": "^7.0.0-pre",
|
||||||
"@grafana/toolkit": "^7.0.0-pre"
|
"@grafana/toolkit": "^7.0.0-pre"
|
||||||
|
},
|
||||||
|
"volta": {
|
||||||
|
"node": "12.16.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ describe('InputDatasource', () => {
|
|||||||
const data = readCSV('a,b,c\n1,2,3\n4,5,6');
|
const data = readCSV('a,b,c\n1,2,3\n4,5,6');
|
||||||
const instanceSettings: DataSourceInstanceSettings<InputOptions> = {
|
const instanceSettings: DataSourceInstanceSettings<InputOptions> = {
|
||||||
id: 1,
|
id: 1,
|
||||||
|
uid: 'xxx',
|
||||||
type: 'x',
|
type: 'x',
|
||||||
name: 'xxx',
|
name: 'xxx',
|
||||||
meta: {} as PluginMeta,
|
meta: {} as PluginMeta,
|
||||||
|
Loading…
Reference in New Issue
Block a user