From f8e3c6d24797eef81cdb1b7b587afe77f9e8ab2b Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Thu, 15 Jun 2017 20:51:40 -0700 Subject: [PATCH 01/20] Set verbose output for testing --- check-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index 2ed1935..33c9f41 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -v set -e From 5102e7c1da02fb7ef95054846c3aae2ea4f22465 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Thu, 15 Jun 2017 20:57:39 -0700 Subject: [PATCH 02/20] Set xtrace & verbose --- check-diff.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index 33c9f41..e39c387 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -1,6 +1,6 @@ -#!/bin/bash -v +#!/bin/bash -set -e +set -exv function realpath { php -r 'echo realpath( $argv[1] );' "$1" From 3213f5e01dfc0ee4c50ab336225ca68a0cbeac5b Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 15:36:29 -0700 Subject: [PATCH 03/20] Testing error output --- check-diff.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index e39c387..b1221c3 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -246,6 +246,10 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then + # Testing error output + cat "$TEMP_DIRECTORY/paths-scope" + cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" + cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi From a9b3e3130c786cdf5aa7d41822964d2b26a7146b Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 15:50:37 -0700 Subject: [PATCH 04/20] Revert change --- check-diff.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index b1221c3..e39c387 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -246,10 +246,6 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - # Testing error output - cat "$TEMP_DIRECTORY/paths-scope" - cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" - cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi From 96e0857da0291e6a7f045a6998974cace1a1f196 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 16:09:07 -0700 Subject: [PATCH 05/20] grep path --- check-diff.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/check-diff.sh b/check-diff.sh index e39c387..5469de5 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -246,6 +246,7 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then + which grep cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi From ed572d4d726e42a37d92797d8ee149b0bf3b2afd Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 16:17:15 -0700 Subject: [PATCH 06/20] Which cat --- check-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index 5469de5..cd19173 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -246,7 +246,7 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - which grep + which cat cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi From 8e42de3640d5f191fa2ba16ddfdaaacdf9dc86ab Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 16:20:35 -0700 Subject: [PATCH 07/20] Revert which cat --- check-diff.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index cd19173..e39c387 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -246,7 +246,6 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - which cat cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi From b09c1515e0473a8248adfc4b12ff8c8a12195153 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 16:47:15 -0700 Subject: [PATCH 08/20] Echo platform --- check-diff.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index e39c387..3487f97 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -29,6 +29,9 @@ function remove_diff_range { function set_environment_variables { + # Platform + uname + TEMP_DIRECTORY=$(mktemp -d 2>/dev/null || mktemp -d -t 'dev-lib') PROJECT_DIR=$( git rev-parse --show-toplevel ) DEV_LIB_PATH=${DEV_LIB_PATH:-$( dirname "$0" )/} From 2ed14d3c10add0d65afdd4341f5afc7658b6d8fb Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 16:51:26 -0700 Subject: [PATCH 09/20] Revert test code --- check-diff.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index 3487f97..e39c387 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -29,9 +29,6 @@ function remove_diff_range { function set_environment_variables { - # Platform - uname - TEMP_DIRECTORY=$(mktemp -d 2>/dev/null || mktemp -d -t 'dev-lib') PROJECT_DIR=$( git rev-parse --show-toplevel ) DEV_LIB_PATH=${DEV_LIB_PATH:-$( dirname "$0" )/} From a33837451c8ad6ed731a8ccf65e32bed54a36fc6 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Mon, 19 Jun 2017 17:05:10 -0700 Subject: [PATCH 10/20] Fix DIFF_HEAD conditional --- check-diff.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index e39c387..b496109 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -224,6 +224,7 @@ function set_environment_variables { # treeishA to treeishB (git diff treeishA...treeishB) # treeish to STAGE (git diff --staged treeish) # HEAD to WORKING [default] (git diff HEAD) + DIFF_HEAD=$( tr '[a-z]' '[A-Z]' <<< $DIFF_HEAD ) if [ "$DIFF_HEAD" == 'STAGE' ]; then if [ "$DIFF_BASE" == 'HEAD' ]; then DIFF_ARGS="--staged" @@ -256,7 +257,7 @@ function set_environment_variables { cat "$TEMP_DIRECTORY/paths-scope" | grep -E '\.(xml|svg|xml.dist)(:|$)' | cat - > "$TEMP_DIRECTORY/paths-scope-xml" # Gather the proper states of files to run through linting (this won't apply to phpunit) - if [ "$DIFF_HEAD" != 'working' ]; then + if [ "$DIFF_HEAD" != 'WORKING' ]; then LINTING_DIRECTORY="$(realpath $TEMP_DIRECTORY)/index" mkdir -p "$LINTING_DIRECTORY" From e767c41ca212a8772ccbc35a300460d9338fdeb8 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Tue, 20 Jun 2017 16:12:47 -0700 Subject: [PATCH 11/20] Stop grep from returing an error --- check-diff.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index b496109..4d7bf8a 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -247,14 +247,14 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - cat "$TEMP_DIRECTORY/paths-scope" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/excluded-paths-scope" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true } > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi - cat "$TEMP_DIRECTORY/paths-scope" | grep -E '\.php(:|$)' | cat - > "$TEMP_DIRECTORY/paths-scope-php" - cat "$TEMP_DIRECTORY/paths-scope" | grep -E '\.jsx?(:|$)' | cat - > "$TEMP_DIRECTORY/paths-scope-js" - cat "$TEMP_DIRECTORY/paths-scope" | grep -E '\.(css|scss)(:|$)' | cat - > "$TEMP_DIRECTORY/paths-scope-scss" - cat "$TEMP_DIRECTORY/paths-scope" | grep -E '\.(xml|svg|xml.dist)(:|$)' | cat - > "$TEMP_DIRECTORY/paths-scope-xml" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.php(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-php" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.jsx?(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-js" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.(css|scss)(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-scss" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.(xml|svg|xml.dist)(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-xml" # Gather the proper states of files to run through linting (this won't apply to phpunit) if [ "$DIFF_HEAD" != 'WORKING' ]; then @@ -580,7 +580,7 @@ function install_db { function find_phpunit_dirs { find $PATH_INCLUDES -name 'phpunit.xml*' ! -path '*/vendor/*' -name 'phpunit.xml*' -exec dirname {} \; > $TEMP_DIRECTORY/phpunitdirs if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - cat "$TEMP_DIRECTORY/phpunitdirs" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/included-phpunitdirs" + cat "$TEMP_DIRECTORY/phpunitdirs" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true } > "$TEMP_DIRECTORY/included-phpunitdirs" mv "$TEMP_DIRECTORY/included-phpunitdirs" "$TEMP_DIRECTORY/phpunitdirs" fi cat $TEMP_DIRECTORY/phpunitdirs @@ -792,7 +792,7 @@ function run_qunit { find $PATH_INCLUDES -name Gruntfile.js > "$TEMP_DIRECTORY/gruntfiles" if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - cat "$TEMP_DIRECTORY/gruntfiles" | grep -E -v "$PATH_EXCLUDES_PATTERN" | cat - > "$TEMP_DIRECTORY/included-gruntfiles" + cat "$TEMP_DIRECTORY/gruntfiles" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true } > "$TEMP_DIRECTORY/included-gruntfiles" mv "$TEMP_DIRECTORY/included-gruntfiles" "$TEMP_DIRECTORY/gruntfiles" fi if [ ! -s "$TEMP_DIRECTORY/gruntfiles" ]; then From 7a2610a38c8905094898c49840a0998f68bec7e0 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Tue, 20 Jun 2017 16:25:08 -0700 Subject: [PATCH 12/20] Fix snytax --- check-diff.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index 4d7bf8a..33be529 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -247,14 +247,14 @@ function set_environment_variables { fi if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - cat "$TEMP_DIRECTORY/paths-scope" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true } > "$TEMP_DIRECTORY/excluded-paths-scope" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true; } > "$TEMP_DIRECTORY/excluded-paths-scope" mv "$TEMP_DIRECTORY/excluded-paths-scope" "$TEMP_DIRECTORY/paths-scope" fi - cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.php(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-php" - cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.jsx?(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-js" - cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.(css|scss)(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-scss" - cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.(xml|svg|xml.dist)(:|$)' || true } > "$TEMP_DIRECTORY/paths-scope-xml" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.php(:|$)' || true; } > "$TEMP_DIRECTORY/paths-scope-php" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.jsx?(:|$)' || true; } > "$TEMP_DIRECTORY/paths-scope-js" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.(css|scss)(:|$)' || true; } > "$TEMP_DIRECTORY/paths-scope-scss" + cat "$TEMP_DIRECTORY/paths-scope" | { grep -E '\.(xml|svg|xml.dist)(:|$)' || true; } > "$TEMP_DIRECTORY/paths-scope-xml" # Gather the proper states of files to run through linting (this won't apply to phpunit) if [ "$DIFF_HEAD" != 'WORKING' ]; then @@ -580,7 +580,7 @@ function install_db { function find_phpunit_dirs { find $PATH_INCLUDES -name 'phpunit.xml*' ! -path '*/vendor/*' -name 'phpunit.xml*' -exec dirname {} \; > $TEMP_DIRECTORY/phpunitdirs if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - cat "$TEMP_DIRECTORY/phpunitdirs" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true } > "$TEMP_DIRECTORY/included-phpunitdirs" + cat "$TEMP_DIRECTORY/phpunitdirs" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true; } > "$TEMP_DIRECTORY/included-phpunitdirs" mv "$TEMP_DIRECTORY/included-phpunitdirs" "$TEMP_DIRECTORY/phpunitdirs" fi cat $TEMP_DIRECTORY/phpunitdirs @@ -792,7 +792,7 @@ function run_qunit { find $PATH_INCLUDES -name Gruntfile.js > "$TEMP_DIRECTORY/gruntfiles" if [ ! -z "$PATH_EXCLUDES_PATTERN" ]; then - cat "$TEMP_DIRECTORY/gruntfiles" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true } > "$TEMP_DIRECTORY/included-gruntfiles" + cat "$TEMP_DIRECTORY/gruntfiles" | { grep -E -v "$PATH_EXCLUDES_PATTERN" || true; } > "$TEMP_DIRECTORY/included-gruntfiles" mv "$TEMP_DIRECTORY/included-gruntfiles" "$TEMP_DIRECTORY/gruntfiles" fi if [ ! -s "$TEMP_DIRECTORY/gruntfiles" ]; then From 6ed694a9cf27387a7aa872e2e4b8e6a4fb6d8e93 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Tue, 20 Jun 2017 17:13:51 -0700 Subject: [PATCH 13/20] Remove test code --- check-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index 33be529..03f03a8 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -exv +set -e function realpath { php -r 'echo realpath( $argv[1] );' "$1" From 2bfa85bde7f6814adeff501a25e0ed1f9c7d176c Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Tue, 20 Jun 2017 18:00:30 -0700 Subject: [PATCH 14/20] Add Gitlab branch info --- check-diff.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index 03f03a8..1c82894 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -69,6 +69,9 @@ function set_environment_variables { DIFF_BASE=${DIFF_BASE:-$TRAVIS_COMMIT^} fi DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} + elif [[ ! -z "${GITLAB_CI}" ]]; then + DIFF_BASE=${DIFF_BASE:-$CI_BUILD_BEFORE_SHA} + DIFF_HEAD=${DIFF_HEAD:-HEAD} else DIFF_BASE=${DIFF_BASE:-HEAD} DIFF_HEAD=${DIFF_HEAD:-WORKING} From fe1c4120cff00d907e0d92ee83c2aca5e3ad9828 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Tue, 20 Jun 2017 18:27:24 -0700 Subject: [PATCH 15/20] Testing a theory --- check-diff.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index 1c82894..2fbdb4c 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -70,6 +70,8 @@ function set_environment_variables { fi DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} elif [[ ! -z "${GITLAB_CI}" ]]; then + git fetch origin "$CI_COMMIT_REF_NAME" + git branch "$CI_COMMIT_REF_NAME" FETCH_HEAD DIFF_BASE=${DIFF_BASE:-$CI_BUILD_BEFORE_SHA} DIFF_HEAD=${DIFF_HEAD:-HEAD} else From 82666a7cabfa66897d4c0b8c2d7a598817971511 Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Tue, 20 Jun 2017 18:29:59 -0700 Subject: [PATCH 16/20] Remove gitlab code --- check-diff.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/check-diff.sh b/check-diff.sh index 2fbdb4c..03f03a8 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -69,11 +69,6 @@ function set_environment_variables { DIFF_BASE=${DIFF_BASE:-$TRAVIS_COMMIT^} fi DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} - elif [[ ! -z "${GITLAB_CI}" ]]; then - git fetch origin "$CI_COMMIT_REF_NAME" - git branch "$CI_COMMIT_REF_NAME" FETCH_HEAD - DIFF_BASE=${DIFF_BASE:-$CI_BUILD_BEFORE_SHA} - DIFF_HEAD=${DIFF_HEAD:-HEAD} else DIFF_BASE=${DIFF_BASE:-HEAD} DIFF_HEAD=${DIFF_HEAD:-WORKING} From d955a99f3c97bd0ebe56fa4e233fbe5f0f846431 Mon Sep 17 00:00:00 2001 From: ThierryA Date: Mon, 24 Jul 2017 16:31:11 +0200 Subject: [PATCH 17/20] Added GitLab config Re: https://gitlab.com/gitlab-org/gitlab-ce/issues/35387#note_35730881 --- check-diff.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index 03f03a8..255a36d 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -69,6 +69,9 @@ function set_environment_variables { DIFF_BASE=${DIFF_BASE:-$TRAVIS_COMMIT^} fi DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} + elif [[ ! -z "${GITLAB_CI}" ]]; then + DIFF_BASE=${DIFF_BASE:-master} + DIFF_HEAD=${DIFF_HEAD:-$CI_COMMIT_SHA} else DIFF_BASE=${DIFF_BASE:-HEAD} DIFF_HEAD=${DIFF_HEAD:-WORKING} From 7dc92580418dbf557174ad3dd40bd7b7fedb684d Mon Sep 17 00:00:00 2001 From: ThierryA Date: Mon, 24 Jul 2017 17:46:10 +0200 Subject: [PATCH 18/20] Remove diff head modification --- check-diff.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index 255a36d..0637a75 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -227,7 +227,6 @@ function set_environment_variables { # treeishA to treeishB (git diff treeishA...treeishB) # treeish to STAGE (git diff --staged treeish) # HEAD to WORKING [default] (git diff HEAD) - DIFF_HEAD=$( tr '[a-z]' '[A-Z]' <<< $DIFF_HEAD ) if [ "$DIFF_HEAD" == 'STAGE' ]; then if [ "$DIFF_BASE" == 'HEAD' ]; then DIFF_ARGS="--staged" From beb1e31f219d87a9d2525bb070bd05765c0b3027 Mon Sep 17 00:00:00 2001 From: ThierryA Date: Thu, 27 Jul 2017 13:44:58 +0200 Subject: [PATCH 19/20] GitLab integration: add necessary npm config --- check-diff.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/check-diff.sh b/check-diff.sh index 0637a75..00e79eb 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -397,6 +397,13 @@ function install_tools { DEV_LIB_SKIP="$DEV_LIB_SKIP,composer" fi + # Config npm for GitLab. + if [[ ! -z "${GITLAB_CI}" ]]; then + npm config set prefix $TEMP_DIRECTORY + export NODE_PATH=$TEMP_DIRECTORY/lib/node_modules:$NODE_PATH + export PATH=$TEMP_DIRECTORY/bin:$PATH + fi + # Install Node packages. if [ -e package.json ] && [ $( ls node_modules | wc -l ) == 0 ]; then npm install From b456b21d05b9a7c3a046db5585558b0f95a8e15c Mon Sep 17 00:00:00 2001 From: Derek Herman Date: Thu, 10 Aug 2017 12:05:15 -0700 Subject: [PATCH 20/20] Use DIFF_BASE_BRANCH env variable --- check-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-diff.sh b/check-diff.sh index 5254c7e..ca25304 100755 --- a/check-diff.sh +++ b/check-diff.sh @@ -72,7 +72,7 @@ function set_environment_variables { DIFF_BASE=${DIFF_BASE:-$DIFF_BASE_BRANCH} DIFF_HEAD=${DIFF_HEAD:-$TRAVIS_COMMIT} elif [[ ! -z "${GITLAB_CI}" ]]; then - DIFF_BASE=${DIFF_BASE:-master} + DIFF_BASE=${DIFF_BASE:-$DIFF_BASE_BRANCH} DIFF_HEAD=${DIFF_HEAD:-$CI_COMMIT_SHA} else DIFF_BASE=${DIFF_BASE:-HEAD}