diff --git a/.circleci/config.yml b/.circleci/config.yml index af784e99983c3..af57f62f80ae6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,10 @@ refs: filters: branches: only: /^dev.*/ + filter_only_dev_release_branches: &filter_only_dev_release_branches + filters: + branches: + only: /^(dev|release).*/ filter_ignore_branches: &filter_ignore_branches filters: branches: @@ -199,5 +203,6 @@ workflows: - test_and_build_cli - deploy: <<: *filter_only_vtags + <<: *filter_only_dev_release_branches requires: - test_and_build_console \ No newline at end of file diff --git a/scripts/get-version-circleci.sh b/scripts/get-version-circleci.sh index 9035cb1ec1b41..a50e9df835cbd 100755 --- a/scripts/get-version-circleci.sh +++ b/scripts/get-version-circleci.sh @@ -25,4 +25,6 @@ fi if [ -z "$VERSION" ]; then VERSION="$($ROOT/get-version.sh)"; fi +VERSION="$(echo $VERSION | tr -cd '[[:alnum:]]._-')" + echo $VERSION \ No newline at end of file diff --git a/scripts/get-version.sh b/scripts/get-version.sh index 576d4c43c3803..65a136fbd4ca4 100755 --- a/scripts/get-version.sh +++ b/scripts/get-version.sh @@ -8,4 +8,6 @@ GIT_DIRTY=$(test -n "`git status --porcelain`" && echo "-dirty" || echo "") VERSION="${GIT_TAG_EXACT}" test -n "$VERSION" || VERSION="${GIT_BRANCH}-${GIT_SHA}${GIT_DIRTY}" +VERSION="$(echo $VERSION | tr -cd '[[:alnum:]]._-')" + echo "$VERSION"