Fix boost.sh & drone.sh

The coverity buildtype had a missing `$` Also slightly reduce verbosity
boostorg · Dec 31, 2022 · 2a2ed9d · 2a2ed9d
1 parent ac5ae7e
commit 2a2ed9d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.drone/boost.sh b/.drone/boost.sh
@@ -18,10 +18,12 @@ export BOOST_CI_TARGET_BRANCH="$DRONE_BRANCH"
 export BOOST_CI_SRC_FOLDER=$(pwd)
 export CODECOV_NAME=${CODECOV_NAME:-"Drone CI"}
 
+set +x
 echo '==================================> INSTALL'
 . ./ci/common_install.sh
+set +x
 echo "B2 config: $(env | grep B2_ || true)"
-echo '==================================> SCRIPT'
+echo "==================================> SCRIPT ($DRONE_JOB_BUILDTYPE)"
 
 case "$DRONE_JOB_BUILDTYPE" in
     boost)
@@ -36,9 +38,12 @@ case "$DRONE_JOB_BUILDTYPE" in
     coverity)
         if [ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] || [ -z "$COVERITY_SCAN_TOKEN" ]; then
             echo "Coverity details not set up"
+            [ -n "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] || echo 'Missing $COVERITY_SCAN_NOTIFICATION_EMAIL'
+            [ -n "$COVERITY_SCAN_TOKEN" ] || echo 'Missing $COVERITY_SCAN_TOKEN'
             exit 1
         fi
-        if [[ "DRONE_BRANCH" =~ ^(master|develop)$ ]] && [[ "DRONE_BUILD_EVENT" =~ ^(push|cron)$ ]]; then
+        echo "DRONE_BRANCH=$DRONE_BRANCH, DRONE_BUILD_EVENT=$DRONE_BUILD_EVENT, DRONE_REPO=$DRONE_REPO"
+        if [[ "$DRONE_BRANCH" =~ ^(master|develop)$ ]] && [[ "$DRONE_BUILD_EVENT" =~ ^(push|cron)$ ]]; then
             export BOOST_REPO="$DRONE_REPO"
 			export BOOST_BRANCH="$DRONE_BRANCH"
             $BOOST_ROOT/libs/$SELF/ci/coverity.sh

diff --git a/.drone/drone.sh b/.drone/drone.sh
@@ -20,8 +20,9 @@ export CODECOV_NAME=${CODECOV_NAME:-"Drone CI"}
 
 echo '==================================> INSTALL'
 . ./ci/common_install.sh
+set +x
 echo "B2 config: $(env | grep B2_ || true)"
-echo '==================================> SCRIPT'
+echo "==================================> SCRIPT ($DRONE_JOB_BUILDTYPE)"
 
 case "$DRONE_JOB_BUILDTYPE" in
     boost)
@@ -36,9 +37,12 @@ case "$DRONE_JOB_BUILDTYPE" in
     coverity)
         if [ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] || [ -z "$COVERITY_SCAN_TOKEN" ]; then
             echo "Coverity details not set up"
+            [ -n "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] || echo 'Missing $COVERITY_SCAN_NOTIFICATION_EMAIL'
+            [ -n "$COVERITY_SCAN_TOKEN" ] || echo 'Missing $COVERITY_SCAN_TOKEN'
             exit 1
         fi
-        if [[ "DRONE_BRANCH" =~ ^(master|develop)$ ]] && [[ "DRONE_BUILD_EVENT" =~ ^(push|cron)$ ]]; then
+        echo "DRONE_BRANCH=$DRONE_BRANCH, DRONE_BUILD_EVENT=$DRONE_BUILD_EVENT, DRONE_REPO=$DRONE_REPO"
+        if [[ "$DRONE_BRANCH" =~ ^(master|develop)$ ]] && [[ "$DRONE_BUILD_EVENT" =~ ^(push|cron)$ ]]; then
             export BOOST_REPO="$DRONE_REPO"
 			export BOOST_BRANCH="$DRONE_BRANCH"
             $BOOST_ROOT/libs/$SELF/ci/coverity.sh