Merge pull request #325 from Altinity/fix_github_issues

release 2.2.3, cleanup package.json

Author: Slach

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.2.2
+current_version = 2.2.3
 
 [bumpversion:file:package.json]
 

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 2.2.1 (2021-02-17)
+# 2.2.3 (2021-02-17)
 ## Enhancement:
 
 * automate plugin sign process via github actions, fix wrong executable file permissions

dist/MANIFEST.txt

@@ -8,8 +8,8 @@ Hash: SHA512
   "signedByOrg": "vertamedia",
   "signedByOrgName": "Vertamedia",
   "plugin": "vertamedia-clickhouse-datasource",
-  "version": "2.2.2",
-  "time": 1613544113523,
+  "version": "2.2.3",
+  "time": 1613546387194,
   "keyId": "7e4d0c6a708866e7",
   "files": {
     "img/annotations.png": "09cc19df992fede5c4dd830f7b3c7a783702feced07ea9693d417ec127077b00",
@@ -22,7 +22,7 @@ Hash: SHA512
     "partials/annotations.editor.html": "14d2d5add7f13c7c722e33bbc53ef83750fb624e5f7d6efee4a9568addc2ab78",
     "partials/config.html": "51ba130304c63c1a00590a9dc94c8351ff6277e4cf695720de57bff87aeec744",
     "partials/query.editor.html": "eb9ab7af412a922ea2ce09c86b99a75ba70000977a5fd882b8e327a2a27e1904",
-    "plugin.json": "9de19dc46b3490cd0cf98597fea2e9c3a131d818962354ca07e5b4116a83f20c",
+    "plugin.json": "7e322a287a2bd93abde0a5f02aeb64b7e00d14f3f65a011f39036c572981e812",
     "README.md": "3194fcabb4b7ea1666d2d805a633555afbbe8f45e1e6cd73e3c21d0456cd5f46",
     "vertamedia-clickhouse-plugin_darwin_amd64": "eb06f9664650e8c32b5aed3e31a9f77a0382e8ab6c02af430020c12545eb5187",
     "vertamedia-clickhouse-plugin_linux_amd64": "b81329a550f52a6be5fd2d48c0576192292333f36a9a639946e1eed3c80fe596",
@@ -34,9 +34,9 @@ Hash: SHA512
 Version: OpenPGP.js v4.10.1
 Comment: https://openpgpjs.org
 
-wqIEARMKAAYFAmAsurEACgkQfk0ManCIZudsXQIJAQYzQBo09zX8/qdh47vi
-C5QxQLGBQGnjfitTmN6R3y0d5WGkaNVIc03w93EZHMccrsQ3cbWKZR4FDtoI
-UTUboroEAgkBqqS7B2ZNNReUIkcN2Yml6hmSnQnIEPpzdk5MmZZFF3wFdgwu
-fQoXHFxBu4S3bOBEvAYg80H3HzG7Wn3wYAzmp4k=
-=w7dM
+wqEEARMKAAYFAmAsw5MACgkQfk0ManCIZucH7AIInTOR3xlAzk/Iu7PhAZQI
+j9G4bACbwjFUcRBZiWiIcr6hW7XuVYu4vTEst1RVGuIesCbq611UYCOED1Co
+fT5Zk5sCCQE/Hb0xVqA2gNj2AExBo7/9ZaqYlsbpfO6Plw1wmYJJhnSXmRkf
+AUi5If4qqVLGa7vrUrRNBosEgYdNVSiWrwHcgQ==
+=WLWv
 -----END PGP SIGNATURE-----

dist/plugin.json

@@ -43,7 +43,7 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "2.2.2",
+    "version": "2.2.3",
     "updated": "2020-07-31"
   },
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vertamedia-clickhouse",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "description": "ClickHouse datasource for Grafana",
     "scripts": {
         "build:prod": "webpack --config webpack.config.prod.js",
@@ -27,7 +27,7 @@
         "@babel/core": "^7.9.0",
         "@babel/preset-env": "^7.9.5",
         "@babel/preset-typescript": "^7.9.0",
-        "@grafana/toolkit": "^7.3.5",
+        "@grafana/toolkit": "^7.4.1",
         "@types/grafana": "https://[email protected]/CorpGlory/types-grafana.git",
         "@types/jest": "^24.9.1",
         "@types/lodash-es": "^4.17.1",
@@ -46,7 +46,7 @@
         "ts-loader": "^6.2.2",
         "tslint": "^6.1.1",
         "typescript": "^3.9.5",
-        "uglifyjs-webpack-plugin": "^2.2.2",
+        "uglifyjs-webpack-plugin": "^2.2.0",
         "webpack": "^4.41.0",
         "webpack-cli": "^3.3.9"
     }

release.sh

@@ -13,15 +13,15 @@ git config core.autocrlf input
 git config user.name "$GITHUB_LOGIN"
 git config user.email "$GITHUB_EMAIL"
 docker-compose stop
-docker-compose run frontend_builder
-docker-compose run backend_builder
+docker-compose run --rm frontend_builder
+docker-compose run --rm backend_builder
 dos2unix ./dist/*
 chmod +rx ./dist
 chmod +rx -R ./dist/vertamedia-clickhouse-plugin*
 git add .
 git diff-index --quiet HEAD || git commit -m "prepare to new release, $(grep current_version .bumpversion.cfg)"
 bump2version --verbose $1
-docker-compose run plugin_signer
+docker-compose run --rm plugin_signer
 git add .
 git commit -s -m "sign plugin, $(grep current_version .bumpversion.cfg)"
 git push --tags

src/plugin.json

@@ -43,7 +43,7 @@
         "url": "https://github.com/Vertamedia/clickhouse-grafana"
       }
     ],
-    "version": "2.2.2",
+    "version": "2.2.3",
     "updated": "2020-07-31"
   },