diff --git a/devops/.env.sh b/devops/.env.sh index bc22414..72df1e3 100755 --- a/devops/.env.sh +++ b/devops/.env.sh @@ -8,7 +8,7 @@ export SCALA212=$(cat project/Deps.sc | grep 'val scala212 ' | sed -r 's/.*\"(. export SCALA213=$(cat project/Deps.sc | grep 'val scala213 ' | sed -r 's/.*\"(.*)\".**/\1/') export SCALA3=$(cat project/Deps.sc | grep 'val scala300 ' | sed -r 's/.*\"(.*)\".**/\1/') -[[ -z "$SCALA_VERSION" ]] && exit 1 +[[ -z "$SCALA_VERSION" ]] && echo "Missing SCALA_VERSION" && exit 1 case $SCALA_VERSION in 2.12) SCALA_VERSION="$SCALA212" ;; diff --git a/devops/.validate-publishing.sh b/devops/.validate-publishing.sh new file mode 100755 index 0000000..faa0796 --- /dev/null +++ b/devops/.validate-publishing.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -e +set -x + +[[ "$CI_PULL_REQUEST" != "false" ]] && echo "Publishing not allowed on P/Rs" && exit 0 +[[ ! ("$CI_BRANCH" == "develop" || "$CI_BRANCH_TAG" =~ ^v.*$ ) ]] && echo "Publishing not allowed (CI_BRANCH=$CI_BRANCH, CI_BRANCH_TAG=$CI_BRANCH_TAG)" && exit 0 diff --git a/devops/publish-alien.sh b/devops/publish-alien.sh index 8411391..5a6ace6 100755 --- a/devops/publish-alien.sh +++ b/devops/publish-alien.sh @@ -6,10 +6,10 @@ set -x source ./devops/.env-basic.sh printenv -[[ "$CI_PULL_REQUEST" != "false" ]] && exit 0 -[[ -z "$TOKEN_NUGET" ]] && exit 0 -[[ -z "$TOKEN_NPM" ]] && exit 0 -[[ ! ("$CI_BRANCH" == "develop" || "$CI_BRANCH_TAG" =~ ^v.*$ ) ]] && exit 0 +source ./devops/.validate-publishing.sh + +[[ -z "$TOKEN_NUGET" ]] && echo "Missing TOKEN_NUGET" && exit 0 +[[ -z "$TOKEN_NPM" ]] && echo "Missing TOKEN_NPM" && exit 0 echo "PUBLISH IDL RUNTIMES..." diff --git a/devops/publish-scala.sh b/devops/publish-scala.sh index accdd66..094016b 100755 --- a/devops/publish-scala.sh +++ b/devops/publish-scala.sh @@ -4,10 +4,11 @@ set -e set -x source ./devops/.env.sh +printenv -[[ "$CI_PULL_REQUEST" != "false" ]] && exit 0 -[[ ! ("$CI_BRANCH" == "develop" || "$CI_BRANCH_TAG" =~ ^v.*$ ) ]] && exit 0 -[[ -f "$SONATYPE_SECRET"]] && exit 0 +source ./devops/.validate-publishing.sh + +[[ -f "$SONATYPE_SECRET" ]] && echo "Missing SONATYPE_SECRET=$SONATYPE_SECRET is not a file" && exit 0 echo "PUBLISH SCALA LIBRARIES..."