diff --git a/.ci/phpcs.sh b/.ci/phpcs.sh index c4868490..1639ec4a 100755 --- a/.ci/phpcs.sh +++ b/.ci/phpcs.sh @@ -20,23 +20,8 @@ # along with this program. If not, see . # -# Install composer packages -#composer install --no-scripts --no-ansi - SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -# enable test .env file. -# cp .ci/.env.ci .env - -OUTPUT_FORMAT=txt -EXTRA_PARAMS="-v" - -if [[ $GITHUB_ACTIONS = "true" ]] -then - OUTPUT_FORMAT=gitlab - EXTRA_PARAMS="--diff --dry-run" -fi - # clean up php code cd $SCRIPT_DIR/php-cs-fixer composer update --quiet @@ -44,8 +29,8 @@ rm -f .php-cs-fixer.cache PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \ --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \ - --format=$OUTPUT_FORMAT \ - --allow-risky=yes $EXTRA_PARAMS + --format=txt \ + --allow-risky=yes EXIT_CODE=$? diff --git a/.gitignore b/.gitignore index 37a9393c..0161cc0d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ resources/js/v1/node_modules # ignore v2 node modules resources/js/v2/node_modules + +# ignore generated files. +public/build diff --git a/public/build/.gitkeep b/public/build/.gitkeep deleted file mode 100644 index e69de29b..00000000