From aa83460305fba84df5113157ac852fb5fbd09f5b Mon Sep 17 00:00:00 2001 From: Cloudwise_Luke <282583553@qq.com> Date: Mon, 25 Sep 2023 17:17:11 +0800 Subject: [PATCH 1/3] grafana test --- .github/workflows/grafana-plugin.yml | 27 +++++++++++++++++++++------ iotdb-connector/grafana-plugin/go.mod | 6 +++--- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.github/workflows/grafana-plugin.yml b/.github/workflows/grafana-plugin.yml index 38f7757442e22..14e6f588c43aa 100644 --- a/.github/workflows/grafana-plugin.yml +++ b/.github/workflows/grafana-plugin.yml @@ -25,11 +25,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - + with: + repository: 'iotdb/grafana-plugin' - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: "14.x" + node-version: "1.20" + - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -53,13 +55,26 @@ jobs: restore-keys: | ${{ runner.os }}-${{ matrix.node-version }}-nodemodules- - - name: Install dependencies and Build and test frontend + - name: list dir run: | - cd iotdb-connector/grafana-plugin/ + ls yarn install --frozen-lockfile yarn build - - name: Install dependencies and Build backend + - name: Install dependencies and Build and test frontend run: | cd iotdb-connector/grafana-plugin/ - ./backend-compile.sh + yarn install --frozen-lockfile + yarn build + +# - name: Install dependencies and Build backend +# run: | +# cd iotdb-connector/grafana-plugin/ +# ./backend-compile.sh + + - name: Build backend + if: steps.check-for-backend.outputs.has-backend == 'true' + uses: magefile/mage-action@v1 + with: + version: latest + args: buildAll diff --git a/iotdb-connector/grafana-plugin/go.mod b/iotdb-connector/grafana-plugin/go.mod index e6d4a76021b61..68b227918f7f3 100644 --- a/iotdb-connector/grafana-plugin/go.mod +++ b/iotdb-connector/grafana-plugin/go.mod @@ -15,9 +15,9 @@ module github.com/grafana/grafana-starter-datasource-backend -go 1.16 +go 1.20 require ( - github.com/grafana/grafana-plugin-sdk-go v0.139.0 - github.com/magefile/mage v1.13.0 // indirect + github.com/grafana/grafana-plugin-sdk-go v0.178.0 + github.com/magefile/mage v1.15.0 // indirect ) From 9581cff0545c8dd636ab75a8b04706924df708ab Mon Sep 17 00:00:00 2001 From: Cloudwise_Luke <282583553@qq.com> Date: Mon, 25 Sep 2023 17:21:22 +0800 Subject: [PATCH 2/3] grafana test --- .github/workflows/grafana-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/grafana-plugin.yml b/.github/workflows/grafana-plugin.yml index 14e6f588c43aa..36a1b19a64532 100644 --- a/.github/workflows/grafana-plugin.yml +++ b/.github/workflows/grafana-plugin.yml @@ -4,7 +4,7 @@ on: push: branches: - master - - "new_*" + - 'rel/1.*' paths-ignore: - 'docs/**' - 'site/**' From 0f86652bb5444189b005d39ebd9e19eae5f1b72b Mon Sep 17 00:00:00 2001 From: Cloudwise_Luke <282583553@qq.com> Date: Mon, 25 Sep 2023 17:22:39 +0800 Subject: [PATCH 3/3] grafana test --- .github/workflows/grafana-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/grafana-plugin.yml b/.github/workflows/grafana-plugin.yml index 36a1b19a64532..01da6bf2f9cb2 100644 --- a/.github/workflows/grafana-plugin.yml +++ b/.github/workflows/grafana-plugin.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - repository: 'iotdb/grafana-plugin' + repository: 'iotdb-connector/grafana-plugin' - name: Setup Node.js environment uses: actions/setup-node@v3 with: