Rename job and run it after frontend tests and build passes

This commit is contained in:
Dominik Prokop
2019-07-12 13:19:29 +02:00
parent 5e4971ac01
commit ceaa30d88e
2 changed files with 15 additions and 7 deletions
+11 -3
View File
@@ -13,6 +13,11 @@ aliases:
- &filter-only-master
branches:
only: master
- &filter-not-release-but-master
tags:
ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
branches:
only: master
version: 2
@@ -623,7 +628,7 @@ jobs:
echo "-- no changes to docs files --"
fi
release-packages-nightly:
release-next-packages:
docker:
- image: circleci/node:10
steps:
@@ -636,7 +641,7 @@ jobs:
command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
- run:
name: prepare bumped versions
command: './scripts/circle-check-packages.sh'
command: './scripts/circle-release-next-packages.sh'
workflows:
version: 2
@@ -818,6 +823,9 @@ workflows:
- postgres-integration-test
- cache-server-test
filters: *filter-not-release-or-master
- release-packages-nightly:
- release-next-packages:
requires:
- test-frontend
- build-fast-frontend
filters: *filter-not-release-or-master
@@ -14,9 +14,9 @@ function prapare_version_commit () {
#Get current version from lerna.json
PACKAGE_VERSION=`grep '"version"' lerna.json | cut -d '"' -f 4`
# Get short current commit's has
GIT_BRANCH=$(parse_git_hash)
GIT_SHA=$(parse_git_hash)
echo "Commit: ${GIT_BRANCH}"
echo "Commit: ${GIT_SHA}"
echo "Current lerna.json version: ${PACKAGE_VERSION}"
# count packages that changed
@@ -26,8 +26,8 @@ if [ -z $count ]; then
echo "No changes in packages, skipping packages publishing"
else
echo "Changes detected in ${count} packages"
echo "Releasing packages under ${PACKAGE_VERSION}-${GIT_BRANCH}"
npx lerna version ${PACKAGE_VERSION}-${GIT_BRANCH} --no-git-tag-version --no-push --force-publish -y
echo "Releasing packages under ${PACKAGE_VERSION}-${GIT_SHA}"
npx lerna version ${PACKAGE_VERSION}-${GIT_SHA} --no-git-tag-version --no-push --force-publish -y
echo $'\nGit status:'
git status -s