From f09eb86e5cff70b55d3acc03e4f4584170058889 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Wed, 18 Apr 2018 02:48:27 +0300 Subject: [PATCH] Simplify the call of the php-cs-fixer --- .gitlab-ci.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d24b075..bc8b26b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,19 +24,14 @@ test:backend: script: - export TEMP_DEV_IMAGE="${CONTAINER_IMAGE}:ci-${CI_BUILD_ID}" - docker build --pull -f Dockerfile-dev -t $TEMP_DEV_IMAGE . - # https://github.com/FriendsOfPHP/PHP-CS-Fixer#using-php-cs-fixer-on-ci - - COMMIT_RANGE="${CI_COMMIT_BEFORE_SHA}...${CI_COMMIT_SHA}" - - CHANGED_FILES=$(git diff --name-only --diff-filter=ACMRTUXB "${COMMIT_RANGE}") - - | - if ! echo "${CHANGED_FILES}" | grep -qE "^(\\.php_cs(\\.dist)?|composer\\.lock)$"; then - EXTRA_ARGS=$(printf -- '--path-mode=intersection\n--\n%s' "${CHANGED_FILES}") - else - EXTRA_ARGS='' - fi - > docker run --rm $TEMP_DEV_IMAGE - vendor/bin/php-cs-fixer fix -v --dry-run --stop-on-violation --using-cache=no ${EXTRA_ARGS} + bash -c " + rm /usr/local/etc/php/conf.d/xdebug.ini && + cp -r /var/www/vendor /var/www/html/vendor && + vendor/bin/php-cs-fixer fix -v --dry-run + " - > docker run --rm --add-host=mariadb:`getent hosts mariadb | awk '{ print $1 ; exit }'`