Skip to content

Commit d9e98e3

Browse files
authored
Fix scripted diff check condition (#3128)
1 parent bad3243 commit d9e98e3

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ before_install:
120120
install:
121121
# Our scripts try to be Travis agnostic
122122
- export PULL_REQUEST="$TRAVIS_PULL_REQUEST"
123+
- export COMMIT_RANGE="$TRAVIS_COMMIT_RANGE"
123124
- export JOB_NUMBER="$TRAVIS_JOB_NUMBER"
124125
- export HOST_SRC_DIR=$TRAVIS_BUILD_DIR
125126
- export HOST_CACHE_DIR=$HOME/cache

ci/build_src.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ unset DISPLAY
1212
export CCACHE_COMPRESS=${CCACHE_COMPRESS:-1}
1313
export CCACHE_SIZE=${CCACHE_SIZE:-400M}
1414

15-
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
15+
if [ "$PULL_REQUEST" != "false" ]; then contrib/devtools/commit-script-check.sh $COMMIT_RANGE; fi
1616

1717
#if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed
1818

ci/matrix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export CACHE_DIR=${CACHE_DIR:-$HOST_CACHE_DIR}
2020
export CCACHE_DIR=$CACHE_DIR/ccache
2121

2222
export DOCKER_RUN_VOLUME_ARGS="-v $HOST_SRC_DIR:$SRC_DIR -v $HOST_CACHE_DIR:$CACHE_DIR"
23-
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"
23+
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"
2424
export DOCKER_RUN_ARGS="$DOCKER_RUN_VOLUME_ARGS $DOCKER_RUN_ENV_ARGS"
2525
export DOCKER_RUN_IN_BUILDER="docker run -t --rm -w $SRC_DIR $DOCKER_RUN_ARGS $BUILDER_IMAGE_NAME"
2626

0 commit comments

Comments
 (0)