remove custom tooling

Author: ryantxu

.bumpversion.cfg

@@ -115,13 +115,126 @@ jobs:
     - run:
         name: Package Distribution
         command: npx grafana-toolkit plugin:ci-package
+    - persist_to_workspace:
+        root: .
+        paths:
+        - ci/jobs/package
+        - ci/packages
+        - ci/dist
+        - ci/grafana-test-env
+  test_6_2_5:
+    docker:
+    - image: circleci/node:10-browsers
+    working_directory: ~/plugin
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - restore_cache:
+        keys:
+        - yarn-packages-{{ checksum "yarn.lock" }}
+    - run:
+        name: Setup Grafana (local install)
+        command: |
+          wget https://dl.grafana.com/oss/release/grafana_6.2.5_amd64.deb
+          sudo apt-get install -y adduser libfontconfig1
+          sudo dpkg -i grafana_6.2.5_amd64.deb
+          sudo apt-get install locate
+          sudo updatedb
+          sudo locate grafana
+          sudo cat /etc/grafana/grafana.ini
+          sudo echo ------------------------
+          sudo cp ci/grafana-test-env/custom.ini /usr/share/grafana/conf/custom.ini
+          sudo cp ci/grafana-test-env/custom.ini /etc/grafana/grafana.ini
+          sudo service grafana-server start
+          sudo grafana-cli --version
+    - run:
+        name: Run e2e tests
+        command: |
+          npx grafana-toolkit plugin:ci-test
+    - persist_to_workspace:
+        root: .
+        paths:
+        - ci/jobs/test_6_2_5
+    - store_test_results:
+        path: ci/jobs/test_6_2_5
+    - store_artifacts:
+        path: ci/jobs/test_6_2_5
+  test_6_3_0_beta1:
+    docker:
+    - image: circleci/node:10-browsers
+    working_directory: ~/plugin
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - restore_cache:
+        keys:
+        - yarn-packages-{{ checksum "yarn.lock" }}
+    - run:
+        name: Setup Grafana (local install)
+        command: |
+          wget https://dl.grafana.com/oss/release/grafana_6.3.0-beta1_amd64.deb
+          sudo apt-get install -y adduser libfontconfig1
+          sudo dpkg -i grafana_6.3.0-beta1_amd64.deb
+          sudo apt-get install locate
+          sudo updatedb
+          sudo locate grafana
+          sudo cat /etc/grafana/grafana.ini
+          sudo echo ------------------------
+          sudo cp ci/grafana-test-env/custom.ini /usr/share/grafana/conf/custom.ini
+          sudo cp ci/grafana-test-env/custom.ini /etc/grafana/grafana.ini
+          sudo service grafana-server start
+          sudo grafana-cli --version
+    - run:
+        name: Run e2e tests
+        command: |
+          npx grafana-toolkit plugin:ci-test
+    - persist_to_workspace:
+        root: .
+        paths:
+        - ci/jobs/test_6_3_0_beta1
+    - store_test_results:
+        path: ci/jobs/test_6_3_0_beta1
+    - store_artifacts:
+        path: ci/jobs/test_6_3_0_beta1
+  report:
+    docker:
+    - image: circleci/node:10
+    working_directory: ~/plugin
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - restore_cache:
+        keys:
+        - yarn-packages-{{ checksum "yarn.lock" }}
+    - run:
+        name: Toolkit Report
+        command: npx grafana-toolkit plugin:ci-report
     - store_artifacts:
         path: ci
 workflows:
   version: 2
   plugin_workflow:
     jobs:
     - build_plugin
+    - build_osx
+    - build_win64
+    - build_docs
     - package:
         requires:
         - build_plugin
+        - build_osx
+        - build_win64
+        - build_docs
+    - test_6_2_5:
+        requires:
+        - package
+    - test_6_3_0_beta1:
+        requires:
+        - package
+    - report:
+        requires:
+        - test_6_2_5
+        - test_6_3_0_beta1

.circleci/config.yml

@@ -1,22 +1,11 @@
 # Changelog
 
 
-## In progress
-- Fix release tooling.
-
-
-## v0.4.0
-- Rename to `grafana-worldmap-panel-ng` to allow side-by-side installation
-  with upstream *Grafana Worldmap Panel 0.2.0*.
-- Remove `/dist` folder from source code repository.
-- Add release tooling.
-
-
 ## v0.3.0
 
 - Add new mapping options `table+json` and `table+jsonp` to retrieve
   location information from JSON endpoint, even for table data.
-  The lookup key is the value obtained from the database field 
+  The lookup key is the value obtained from the database field
   designated by `tableQueryOptions.labelLocationKeyField`.
 - Add `autoPanLabels` and `autoWidthLabels` to visual option settings.
 - Add `zoomControl` and `attributionControl` to visual option settings.
@@ -87,7 +76,7 @@
 ## v0.1.0
 
 - Configuration option for turning mouse wheel zoom on or off. [#140](https://github.com/grafana/worldmap-panel/issues/140) Thanks [@Perlovka](https://github.com/Perlovka)
-- Upgrade to Leaflet JS [#132](https://github.com/grafana/worldmap-panel/pull/132) Thanks [@cbarbier](https://github.com/cbarbier)  
+- Upgrade to Leaflet JS [#132](https://github.com/grafana/worldmap-panel/pull/132) Thanks [@cbarbier](https://github.com/cbarbier)
 
 ## v0.0.21
 

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "grafana-worldmap-panel-ng",
-  "version": "0.4.0",
+  "version": "0.3.0",
   "description": "Worldmap Panel Plugin for Grafana",
   "scripts": {
     "build": "grafana-toolkit plugin:build",

Makefile

@@ -1,7 +1,7 @@
 {
   "type": "panel",
-  "name": "Worldmap Panel NG",
-  "id": "grafana-worldmap-ng-panel",
+  "name": "Worldmap Panel",
+  "id": "grafana-worldmap-panel",
 
   "info": {
     "description": "World Map panel for Grafana. Displays time series data or geohash data on a world map.",