From a084bd38d03adf5573e748047ff7a4f76001fe43 Mon Sep 17 00:00:00 2001 From: Gary Lewis Date: Wed, 19 Apr 2017 15:47:33 -0400 Subject: [PATCH 1/4] Introduce Bitbucket pipeline support --- check-diff.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index a16a6cb..063b350 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -55,6 +55,9 @@ function set_environment_variables { fi CHECK_SCOPE=${CHECK_SCOPE:-patches} # 'all', 'changed-files', 'patches' + echo $TRAVIS + echo "printenv" + if [ "$TRAVIS" == true ]; then if [[ "$TRAVIS_PULL_REQUEST" != 'false' ]]; then @@ -69,10 +72,16 @@ function set_environment_variables { DIFF_BASE=${DIFF_BASE:-$TRAVIS_COMMIT^} fi DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} + fi + + if [[ -n "${BITBUCKET_BRANCH+set}" ]]; then + DIFF_BASE=${DIFF_BASE:-$BITBUCKET_COMMIT^} + DIFF_HEAD=${DIFF_HEAD:-$BITBUCKET_COMMIT} else DIFF_BASE=${DIFF_BASE:-HEAD} DIFF_HEAD=${DIFF_HEAD:-WORKING} fi + while [[ $# > 0 ]]; do key="$1" case "$key" in From 136390c5305f827f63d2034d6801da9aec6b7be6 Mon Sep 17 00:00:00 2001 From: Gary Lewis Date: Wed, 19 Apr 2017 15:49:07 -0400 Subject: [PATCH 2/4] Format --- check-diff.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index 063b350..0fb639f 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -53,10 +53,8 @@ function set_environment_variables { echo "LIMIT_TRAVIS_PR_CHECK_SCOPE is obsolete; use CHECK_SCOPE env var instead" 1>&2 return 1 fi - CHECK_SCOPE=${CHECK_SCOPE:-patches} # 'all', 'changed-files', 'patches' - echo $TRAVIS - echo "printenv" + CHECK_SCOPE=${CHECK_SCOPE:-patches} # 'all', 'changed-files', 'patches' if [ "$TRAVIS" == true ]; then if [[ "$TRAVIS_PULL_REQUEST" != 'false' ]]; then From f30de02aef45e0e0d90306d9a2a5351165f0e636 Mon Sep 17 00:00:00 2001 From: Gary Lewis Date: Wed, 19 Apr 2017 16:24:55 -0400 Subject: [PATCH 3/4] Update syntax, remove +set --- check-diff.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index 0fb639f..b125f87 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -53,9 +53,11 @@ function set_environment_variables { echo "LIMIT_TRAVIS_PR_CHECK_SCOPE is obsolete; use CHECK_SCOPE env var instead" 1>&2 return 1 fi - CHECK_SCOPE=${CHECK_SCOPE:-patches} # 'all', 'changed-files', 'patches' + echo $TRAVIS + echo "printenv" + if [ "$TRAVIS" == true ]; then if [[ "$TRAVIS_PULL_REQUEST" != 'false' ]]; then @@ -70,9 +72,7 @@ function set_environment_variables { DIFF_BASE=${DIFF_BASE:-$TRAVIS_COMMIT^} fi DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} - fi - - if [[ -n "${BITBUCKET_BRANCH+set}" ]]; then + elif [[ ! -z "${BITBUCKET_BRANCH}" ]]; then DIFF_BASE=${DIFF_BASE:-$BITBUCKET_COMMIT^} DIFF_HEAD=${DIFF_HEAD:-$BITBUCKET_COMMIT} else From eca23a1c7451b48a3dc178d8d758585b91c399d8 Mon Sep 17 00:00:00 2001 From: Gary Lewis Date: Wed, 19 Apr 2017 16:25:34 -0400 Subject: [PATCH 4/4] Remove echo statements --- check-diff.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index b125f87..8542760 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -55,9 +55,6 @@ function set_environment_variables { fi CHECK_SCOPE=${CHECK_SCOPE:-patches} # 'all', 'changed-files', 'patches' - echo $TRAVIS - echo "printenv" - if [ "$TRAVIS" == true ]; then if [[ "$TRAVIS_PULL_REQUEST" != 'false' ]]; then