Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CI: fix shellcheck issues (#789)

Browse Source 
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
This commit is contained in:
Mario Trangoni
2019-10-04 17:10:17 +02:00
committed by Alexander Zobnin
parent 224caa034d
commit fe943ac0e4
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/deploy-docs.sh
View File

@@ -10,15 +10,15 @@ set -o pipefail
echo "current dir: $(pwd)"
# Setup git env
git config --global user.email $CI_GIT_EMAIL
git config --global user.name $CI_GIT_USER
git config --global user.email "$CI_GIT_EMAIL"
git config --global user.name "$CI_GIT_USER"
echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)"
git checkout -b $GH_PAGES_BRANCH
rm -rf * || true
git checkout -b "$GH_PAGES_BRANCH"
rm -rf ./* || true
mv ../gh-pages/docs/site/* ./
git add --force .
git commit -m "build docs from commit ${CIRCLE_SHA1:0:7} (branch $CIRCLE_BRANCH)"
git log -n 3
git push origin $GH_PAGES_BRANCH --force
git push origin "$GH_PAGES_BRANCH" --force

14
.circleci/make-release.sh
View File

@@ -8,13 +8,13 @@ set -o errexit
set -o pipefail
# Setup git env
git config --global user.email $CI_GIT_EMAIL
git config --global user.name $CI_GIT_USER
git config --global user.email "$CI_GIT_EMAIL"
git config --global user.name "$CI_GIT_USER"
echo "git user is $CI_GIT_USER ($CI_GIT_EMAIL)"
RELEASE_VER=$(echo $CIRCLE_TAG | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)")
RELEASE_VER=$(echo "$CIRCLE_TAG" | grep -Po "(?<=v)[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)")
if [ -z $RELEASE_VER ]; then
if [ -z "$RELEASE_VER" ]; then
echo "No release version provided"
exit 1
fi
@@ -28,7 +28,7 @@ fi
RELEASE_BRANCH=release-$RELEASE_VER
# Build plugin
git checkout -b $RELEASE_BRANCH
git checkout -b "$RELEASE_BRANCH"
yarn install --pure-lockfile && yarn build
# Commit release
@@ -36,7 +36,7 @@ git add --force dist/
git commit -m "release $RELEASE_VER"
RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}")
echo $RELEASE_COMMIT_HASH
echo "$RELEASE_COMMIT_HASH"
# Push release branch
git push origin $RELEASE_BRANCH
git push origin "$RELEASE_BRANCH"