diff --git a/.gitignore b/.gitignore index 8252b3b4b1969f488b50945369e3835deb58de14..ee46cd1954375bd2bc5d9706e6c1851b148390e9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /.idea/ /.php_cs*cache /reports/ - composer.lock package-lock.json yarn.lock diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7055e4385ed551d91efb90db534ce0dc3e4c4c15..2ed49f40888f17517328a63116fb4205cf037fa7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,33 +1,16 @@ include: - project: pole-is/tools/ci-config - ref: "2.0.0" - file: /php-package-ci.yml + ref: "2.1.0" + file: /php-multiversions-ci.yml - project: pole-is/tools/ci-config - ref: "2.0.0" + ref: "2.1.0" file: /satis-ci.yml -stages: - - vendor - - test - - deploy - -# Personnalisation des tâches par défaut: - .php: variables: - DEBIAN_CODENAME: "stretch" - PHP_VERSION: "7.1" + PHP_IMAGE: gitlab-registry.irstea.fr/pole-is/docker/php/ci/panther + PHP_IMAGE_TAG: "20.02" -test:phpunit: -# variables: -# PHP_IMAGE: gitlab-registry.irstea.fr/pole-is/docker/php/ci/panther +.php-test: script: - - composer test:phpunit -- --coverage-text --coverage-html=reports/coverage --log-junit=reports/junit.xml --colors=never - artifacts: - name: reports - expose_as: "phpunit reports" - when: always - paths: - - reports/ - reports: - junit: reports/junit.xml + - composer "$CI_JOB_NAME" \ No newline at end of file diff --git a/composer.json b/composer.json index 8cf9c515a3d532d19b037d2e483a6d049e222b3f..540abfc5618ce7c8dcbe8655789a45dadc732c0c 100644 --- a/composer.json +++ b/composer.json @@ -161,6 +161,7 @@ "vendor/bin/phpunit --coverage-text --coverage-html=reports/coverage --log-junit=reports/junit.xml" ], "test:serve": [ + "@test:install-assets", "@php tests/console server:run -v --docroot=tests/Fixtures/public" ], @@ -172,4 +173,4 @@ "set -x; IMG=`docker build --build-arg \"PHP_VERSION=${PHP_VERSION:-7.1}\" --pull -q .` && docker run --rm -v ${PWD}:/var/www/theme-bundle -u `id -u`:`id -g` $IMG composer test" ] } -} +} \ No newline at end of file diff --git a/reports/junit.xml b/reports/junit.xml new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391