Skip to content

Commit a530517

Browse files
committed
Merge branch 'master' of github.com:Altinity/clickhouse-grafana into fix_github_issues
Signed-off-by: Eugene Klimov <[email protected]> # Conflicts: # dist/MANIFEST.txt
2 parents 3f687d3 + 59e0b2f commit a530517

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@babel/core": "^7.9.0",
2828
"@babel/preset-env": "^7.9.5",
2929
"@babel/preset-typescript": "^7.9.0",
30-
"@grafana/toolkit": "^7.3.5",
30+
"@grafana/toolkit": "^7.4.1",
3131
"@types/grafana": "https://[email protected]/CorpGlory/types-grafana.git",
3232
"@types/jest": "^24.9.1",
3333
"@types/lodash-es": "^4.17.1",

release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ git config core.autocrlf input
1313
git config user.name "$GITHUB_LOGIN"
1414
git config user.email "$GITHUB_EMAIL"
1515
docker-compose stop
16-
docker-compose run frontend_builder
17-
docker-compose run backend_builder
16+
docker-compose run --rm frontend_builder
17+
docker-compose run --rm backend_builder
1818
dos2unix ./dist/*
1919
chmod +rx ./dist
2020
chmod +rx -R ./dist/vertamedia-clickhouse-plugin*
2121
git add .
2222
git diff-index --quiet HEAD || git commit -m "prepare to new release, $(grep current_version .bumpversion.cfg)"
2323
bump2version --verbose $1
24-
docker-compose run plugin_signer
24+
docker-compose run --rm plugin_signer
2525
git add .
2626
git commit -s -m "sign plugin, $(grep current_version .bumpversion.cfg)"
2727
git push --tags

0 commit comments

Comments
 (0)