Logging adjustments
This commit is contained in:
Родитель
c3cd44010f
Коммит
cf530482a6
|
@ -4,7 +4,8 @@
|
||||||
START_TIME=$SECONDS
|
START_TIME=$SECONDS
|
||||||
|
|
||||||
### Configure environment
|
### Configure environment
|
||||||
|
# Debug, echo every command
|
||||||
|
#set -x
|
||||||
set -o errexit # always exit on error
|
set -o errexit # always exit on error
|
||||||
set -o pipefail # don't ignore exit codes when piping output
|
set -o pipefail # don't ignore exit codes when piping output
|
||||||
set -o nounset # fail on unset variables
|
set -o nounset # fail on unset variables
|
||||||
|
@ -40,7 +41,7 @@ elif [ -f $1/config.json ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### Compile
|
### Compile
|
||||||
log "Exporting config vars to environment"
|
log "Exporting config vars to environment..."
|
||||||
export_env_dir
|
export_env_dir
|
||||||
|
|
||||||
mkdir -p $SALESFORCE_DIR
|
mkdir -p $SALESFORCE_DIR
|
||||||
|
@ -86,7 +87,7 @@ fi
|
||||||
: ${SALESFORCE_BYPASS_COMPILE:="false"}
|
: ${SALESFORCE_BYPASS_COMPILE:="false"}
|
||||||
export SALESFORCE_DEPLOY_DIR="$SALESFORCE_DIR"
|
export SALESFORCE_DEPLOY_DIR="$SALESFORCE_DIR"
|
||||||
if [ "$SALESFORCE_BYPASS_COMPILE" == "false" ]; then
|
if [ "$SALESFORCE_BYPASS_COMPILE" == "false" ]; then
|
||||||
status "Invoking $SALESFORCE_DIR/force.js compile phase..."
|
status "Invoking $SALESFORCE_DIR_NAME/force.js compile phase..."
|
||||||
$SALESFORCE_DIR/node/bin/node $SALESFORCE_DIR/force.js compile
|
$SALESFORCE_DIR/node/bin/node $SALESFORCE_DIR/force.js compile
|
||||||
else
|
else
|
||||||
# bypass when the add-on created org is not used, eg Review app aren't used by Test Runner
|
# bypass when the add-on created org is not used, eg Review app aren't used by Test Runner
|
||||||
|
|
|
@ -51,7 +51,6 @@ export_env_dir() {
|
||||||
for e in $(ls $ENV_DIR); do
|
for e in $(ls $ENV_DIR); do
|
||||||
echo "$e" | grep -E "$whitelist_regex" | grep -qvE "$blacklist_regex" &&
|
echo "$e" | grep -E "$whitelist_regex" | grep -qvE "$blacklist_regex" &&
|
||||||
export $e=$(cat $ENV_DIR/$e)
|
export $e=$(cat $ENV_DIR/$e)
|
||||||
debug "$e=$(cat $ENV_DIR/$e)"
|
|
||||||
:
|
:
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
Загрузка…
Ссылка в новой задаче