mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
Fix scripted diff check condition (#3128)
This commit is contained in:
parent
bad3243b8e
commit
d9e98e31ea
@ -120,6 +120,7 @@ before_install:
|
||||
install:
|
||||
# Our scripts try to be Travis agnostic
|
||||
- export PULL_REQUEST="$TRAVIS_PULL_REQUEST"
|
||||
- export COMMIT_RANGE="$TRAVIS_COMMIT_RANGE"
|
||||
- export JOB_NUMBER="$TRAVIS_JOB_NUMBER"
|
||||
- export HOST_SRC_DIR=$TRAVIS_BUILD_DIR
|
||||
- export HOST_CACHE_DIR=$HOME/cache
|
||||
|
@ -12,7 +12,7 @@ unset DISPLAY
|
||||
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
|
||||
export CCACHE_SIZE=${CCACHE_SIZE:-400M}
|
||||
|
||||
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
|
||||
if [ "$PULL_REQUEST" != "false" ]; then contrib/devtools/commit-script-check.sh $COMMIT_RANGE; fi
|
||||
|
||||
#if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed
|
||||
|
||||
|
@ -20,7 +20,7 @@ export CACHE_DIR=${CACHE_DIR:-$HOST_CACHE_DIR}
|
||||
export CCACHE_DIR=$CACHE_DIR/ccache
|
||||
|
||||
export DOCKER_RUN_VOLUME_ARGS="-v $HOST_SRC_DIR:$SRC_DIR -v $HOST_CACHE_DIR:$CACHE_DIR"
|
||||
export DOCKER_RUN_ENV_ARGS="-e SRC_DIR=$SRC_DIR -e CACHE_DIR=$CACHE_DIR -e PULL_REQUEST=$PULL_REQUEST -e JOB_NUMBER=$JOB_NUMBER -e BUILD_TARGET=$BUILD_TARGET"
|
||||
export DOCKER_RUN_ENV_ARGS="-e SRC_DIR=$SRC_DIR -e CACHE_DIR=$CACHE_DIR -e PULL_REQUEST=$PULL_REQUEST -e COMMIT_RANGE=$COMMIT_RANGE -e JOB_NUMBER=$JOB_NUMBER -e BUILD_TARGET=$BUILD_TARGET"
|
||||
export DOCKER_RUN_ARGS="$DOCKER_RUN_VOLUME_ARGS $DOCKER_RUN_ENV_ARGS"
|
||||
export DOCKER_RUN_IN_BUILDER="docker run -t --rm -w $SRC_DIR $DOCKER_RUN_ARGS $BUILDER_IMAGE_NAME"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user