From 1273c88e74ce34ab9ecdcf353b5a28956fba54ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Date: Sat, 27 Jun 2020 12:46:40 +0300 Subject: [PATCH 1/3] .travis: add Grafana 7.0.4 to testing matrix & update --- .travis.yml | 43 +++++++++++++++++++++++++++++++++---------- README.md | 7 ++++++- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3421d3f..a3ecffd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,14 @@ services: # Different Grafana + Go versions that will be tested. jobs: include: - - name: "Grafana 6.7.1 1.14.x" + - name: "Grafana 7.0.4 1.14.x" env: - - "GRAFANA_VERSION=6.7.1" + - "GRAFANA_VERSION=7.0.4" + - "GRAFANA_INTEGRATION=1" + go: "1.14.x" + - name: "Grafana 6.7.4 1.14.x" + env: + - "GRAFANA_VERSION=6.7.4" - "GRAFANA_INTEGRATION=1" go: "1.14.x" - name: "Grafana 6.6.2 1.14.x" @@ -22,14 +27,20 @@ jobs: - "GRAFANA_VERSION=6.5.3" - "GRAFANA_INTEGRATION=1" go: "1.14.x" - - name: "Grafana 6.4.5 1.14.x" + + - name: "Grafana 7.0.4 1.13.x" env: - - "GRAFANA_VERSION=6.4.5 1.13.x" + - "GRAFANA_VERSION=7.0.4" + - "GRAFANA_INTEGRATION=1" + go: "1.13.x" + - name: "Grafana 6.4.5 1.13.x" + env: + - "GRAFANA_VERSION=6.4.5" - "GRAFANA_INTEGRATION=1" go: "1.13.x" - - name: "Grafana 6.7.1 1.13.x" + - name: "Grafana 6.7.4 1.13.x" env: - - "GRAFANA_VERSION=6.7.1" + - "GRAFANA_VERSION=6.7.4" - "GRAFANA_INTEGRATION=1" go: "1.13.x" - name: "Grafana 6.6.2 1.13.x" @@ -47,9 +58,15 @@ jobs: - "GRAFANA_VERSION=6.4.5 1.13.x" - "GRAFANA_INTEGRATION=1" go: "1.13.x" - - name: "Grafana 6.7.1 1.12.x" + + - name: "Grafana 7.0.4 1.12.x" + env: + - "GRAFANA_VERSION=7.0.4" + - "GRAFANA_INTEGRATION=1" + go: "1.12.x" + - name: "Grafana 6.7.4 1.12.x" env: - - "GRAFANA_VERSION=6.7.1" + - "GRAFANA_VERSION=6.7.4" - "GRAFANA_INTEGRATION=1" go: "1.12.x" - name: "Grafana 6.6.2 1.12.x" @@ -67,9 +84,15 @@ jobs: - "GRAFANA_VERSION=6.4.5" - "GRAFANA_INTEGRATION=1" go: "1.12.x" - - name: "Grafana 6.7.1 1.11.x" + + - name: "Grafana 7.0.4 1.11.x" + env: + - "GRAFANA_VERSION=6.7.4" + - "GRAFANA_INTEGRATION=1" + go: "1.11.x" + - name: "Grafana 6.7.4 1.11.x" env: - - "GRAFANA_VERSION=6.7.1" + - "GRAFANA_VERSION=6.7.4" - "GRAFANA_INTEGRATION=1" go: "1.11.x" - name: "Grafana 6.6.2 1.11.x" diff --git a/README.md b/README.md index 3bd9e45b..4051c254 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,8 @@ datasources. State of support for misc API parts noted below. There is no exact roadmap. The integration tests are being run against the following Grafana versions: -* [6.7.1](./travis.yml) +* [7.0.4](./travis.yml) +* [6.7.4](./travis.yml) * [6.6.2](/.travis.yml) * [6.5.3](/.travis.yml) * [6.4.5](/.travis.yml) @@ -115,6 +116,10 @@ With the following Go versions: * 1.12.x * 1.11.x +Note that the integration tests only touch the API end-points. The members in +structs of boards, panels, etc. might change their meaning or (dis-)appear +completely between versions so it is not guaranteed that they will work 100%. + I still have interest to this library development but not always have time for it. So I gladly accept new contributions. Drop an issue or [contact me](grafov@gmail.com). From 8624326b3f251484a11be3646fd68f3ba9673b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Date: Sat, 27 Jun 2020 12:50:12 +0300 Subject: [PATCH 2/3] .travis: remove nl for testing --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3ecffd7..7c17c2e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,6 @@ jobs: - "GRAFANA_VERSION=6.4.5" - "GRAFANA_INTEGRATION=1" go: "1.12.x" - - name: "Grafana 7.0.4 1.11.x" env: - "GRAFANA_VERSION=6.7.4" From 8159f21f3b4c6bd821691ef059c6a048a17185ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Date: Sat, 27 Jun 2020 23:08:12 +0300 Subject: [PATCH 3/3] .travis: fix version strings --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c17c2e0..b492bbcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ jobs: go: "1.13.x" - name: "Grafana 6.4.5 1.13.x" env: - - "GRAFANA_VERSION=6.4.5 1.13.x" + - "GRAFANA_VERSION=6.4.5" - "GRAFANA_INTEGRATION=1" go: "1.13.x" @@ -86,7 +86,7 @@ jobs: go: "1.12.x" - name: "Grafana 7.0.4 1.11.x" env: - - "GRAFANA_VERSION=6.7.4" + - "GRAFANA_VERSION=7.0.4" - "GRAFANA_INTEGRATION=1" go: "1.11.x" - name: "Grafana 6.7.4 1.11.x"