Skip to content
This repository has been archived by the owner on Nov 10, 2022. It is now read-only.

Gitlab Integration #253

Merged
merged 21 commits into from
Aug 10, 2017
Merged

Gitlab Integration #253

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f8e3c6d
Set verbose output for testing
valendesigns Jun 16, 2017
5102e7c
Set xtrace & verbose
valendesigns Jun 16, 2017
3213f5e
Testing error output
valendesigns Jun 19, 2017
a9b3e31
Revert change
valendesigns Jun 19, 2017
96e0857
grep path
valendesigns Jun 19, 2017
ed572d4
Which cat
valendesigns Jun 19, 2017
8e42de3
Revert which cat
valendesigns Jun 19, 2017
b09c151
Echo platform
valendesigns Jun 19, 2017
2ed14d3
Revert test code
valendesigns Jun 19, 2017
a338374
Fix DIFF_HEAD conditional
valendesigns Jun 20, 2017
e767c41
Stop grep from returing an error
valendesigns Jun 20, 2017
7a2610a
Fix snytax
valendesigns Jun 20, 2017
6ed694a
Remove test code
valendesigns Jun 21, 2017
2bfa85b
Add Gitlab branch info
valendesigns Jun 21, 2017
fe1c412
Testing a theory
valendesigns Jun 21, 2017
82666a7
Remove gitlab code
valendesigns Jun 21, 2017
d955a99
Added GitLab config
ThierryA Jul 24, 2017
7dc9258
Remove diff head modification
ThierryA Jul 24, 2017
beb1e31
GitLab integration: add necessary npm config
ThierryA Jul 27, 2017
c7aa799
Merge branch 'master' into gitlab
valendesigns Aug 10, 2017
b456b21
Use DIFF_BASE_BRANCH env variable
valendesigns Aug 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions check-diff.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ 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:-$DIFF_BASE_BRANCH}
DIFF_HEAD=${DIFF_HEAD:-$CI_COMMIT_SHA}
else
DIFF_BASE=${DIFF_BASE:-HEAD}
DIFF_HEAD=${DIFF_HEAD:-WORKING}
Expand Down Expand Up @@ -248,17 +251,17 @@ 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
if [ "$DIFF_HEAD" != 'WORKING' ]; then
LINTING_DIRECTORY="$(realpath $TEMP_DIRECTORY)/index"
mkdir -p "$LINTING_DIRECTORY"

Expand Down Expand Up @@ -396,6 +399,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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be eliminated once #252 is resolved.


# Install Node packages.
if [ -e package.json ] && [ $( ls node_modules | wc -l ) == 0 ]; then
npm install
Expand Down Expand Up @@ -581,7 +591,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
Expand Down Expand Up @@ -793,7 +803,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
Expand Down