Skip to content

Commit da5a9ba

Browse files
committed
use canary
1 parent fbe550c commit da5a9ba

File tree

4 files changed

+18
-10061
lines changed

4 files changed

+18
-10061
lines changed

.circleci/config.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- ci/packages
4747
- ci/dist
4848
- ci/grafana-test-env
49-
test_6_2_5:
49+
test_6_3_0:
5050
docker:
5151
- image: circleci/node:10-browsers
5252
working_directory: ~/plugin
@@ -60,9 +60,9 @@ jobs:
6060
- run:
6161
name: Setup Grafana (local install)
6262
command: |
63-
wget https://dl.grafana.com/oss/release/grafana_6.2.5_amd64.deb
63+
wget https://dl.grafana.com/oss/release/grafana_6.3.0_amd64.deb
6464
sudo apt-get install -y adduser libfontconfig1
65-
sudo dpkg -i grafana_6.2.5_amd64.deb
65+
sudo dpkg -i grafana_6.3.0_amd64.deb
6666
sudo apt-get install locate
6767
sudo updatedb
6868
sudo locate grafana
@@ -79,12 +79,12 @@ jobs:
7979
- persist_to_workspace:
8080
root: .
8181
paths:
82-
- ci/jobs/test_6_2_5
82+
- ci/jobs/test_6_3_0
8383
- store_test_results:
84-
path: ci/jobs/test_6_2_5
84+
path: ci/jobs/test_6_3_0
8585
- store_artifacts:
86-
path: ci/jobs/test_6_2_5
87-
test_6_3_0_beta1:
86+
path: ci/jobs/test_6_3_0
87+
test_6_4_0:
8888
docker:
8989
- image: circleci/node:10-browsers
9090
working_directory: ~/plugin
@@ -98,9 +98,9 @@ jobs:
9898
- run:
9999
name: Setup Grafana (local install)
100100
command: |
101-
wget https://dl.grafana.com/oss/release/grafana_6.3.0-beta1_amd64.deb
101+
wget https://dl.grafana.com/oss/release/grafana_6.4.0_amd64.deb
102102
sudo apt-get install -y adduser libfontconfig1
103-
sudo dpkg -i grafana_6.3.0-beta1_amd64.deb
103+
sudo dpkg -i grafana_6.4.0_amd64.deb
104104
sudo apt-get install locate
105105
sudo updatedb
106106
sudo locate grafana
@@ -117,11 +117,11 @@ jobs:
117117
- persist_to_workspace:
118118
root: .
119119
paths:
120-
- ci/jobs/test_6_3_0_beta1
120+
- ci/jobs/test_6_4_0
121121
- store_test_results:
122-
path: ci/jobs/test_6_3_0_beta1
122+
path: ci/jobs/test_6_4_0
123123
- store_artifacts:
124-
path: ci/jobs/test_6_3_0_beta1
124+
path: ci/jobs/test_6_4_0
125125
report:
126126
docker:
127127
- image: circleci/node:10
@@ -146,13 +146,13 @@ workflows:
146146
- package:
147147
requires:
148148
- build_plugin
149-
- test_6_2_5:
149+
- test_6_3_0:
150150
requires:
151151
- package
152-
- test_6_3_0_beta1:
152+
- test_6_4_0:
153153
requires:
154154
- package
155155
- report:
156156
requires:
157-
- test_6_2_5
158-
- test_6_3_0_beta1
157+
- test_6_3_0
158+
- test_6_4_0

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"moment": "^2.22.1"
2828
},
2929
"devDependencies": {
30-
"@grafana/toolkit": "next",
30+
"@grafana/toolkit": "canary",
3131
"@types/grafana": "github:CorpGlory/types-grafana.git"
3232
}
3333
}

src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import './style.css';
77
import { DSInfo, RenderMode } from './types';
88
import { examples } from './examples';
99

10-
import { DataQueryResponse, DataSourceApi } from '@grafana/ui';
10+
import { DataQueryResponse, DataSourceApi } from '@grafana/data';
1111

1212
class AjaxCtrl extends MetricsPanelCtrl {
1313
static templateUrl = 'partials/module.html';

0 commit comments

Comments
 (0)