From 622b43533703c1d91564af0923db880ece13edea Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Thu, 12 Mar 2020 10:24:21 -0400 Subject: [PATCH] Another attempt to fix CI --- .travis.yml | 12 ++++++------ Jenkinsfile | 24 +++++++++++++++--------- build/phpunit.xml | 1 - 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43e51c44..62f82e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,15 @@ php: script: - mkdir -p build/logs - - phpdbg -qrr -- vendor/bin/phpunit -c build + - php vendor/bin/phpunit -c build -after_script: - - CODECLIMATE_REPO_TOKEN=2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 vendor/bin/test-reporter +#after_script: +# - CODECLIMATE_REPO_TOKEN=2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 vendor/bin/test-reporter matrix: allow_failures: - php: nightly -addons: - code_climate: - repo_token: 2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 \ No newline at end of file +#addons: +# code_climate: +# repo_token: 2cbddcebcb9256b3402867282e119dbe61de0b31039325356af3c7d72ed6d058 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index a93c8cdf..c99a758f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,20 @@ pipeline { agent none stages { + stage('setup') { + agent { + docker { + image 'php-alpine' + args '-u root --privileged' + } + steps { + sh 'apk add --no-cache git' + sh 'curl -sS https://getcomposer.org/installer | php' + sh 'rm -f composer.lock' + sh 'php composer.phar install --ignore-platform-reqs' + } + } + } stage('PHP 7.3') { agent { docker { @@ -9,10 +23,6 @@ pipeline { } } steps { - sh 'apk add --no-cache git' - sh 'curl -sS https://getcomposer.org/installer | php' - sh 'rm -f composer.lock' - sh 'php composer.phar install --ignore-platform-reqs' sh 'php ./vendor/bin/phpunit --colors=never' } } @@ -24,11 +34,7 @@ pipeline { } } steps { - sh 'apk add --no-cache git php7-phpdbg' - sh 'curl -sS https://getcomposer.org/installer | php' - sh 'rm -f composer.lock' - sh 'php composer.phar install --ignore-platform-reqs' - sh 'phpdbg -qrr -- ./vendor/bin/phpunit --coverage-text --colors=never' + sh 'phpdbg -qrr -- ./vendor/bin/phpunit --colors=never' step([ $class: 'CloverPublisher', cloverReportDir: '', diff --git a/build/phpunit.xml b/build/phpunit.xml index dc4dcdfe..339f7750 100644 --- a/build/phpunit.xml +++ b/build/phpunit.xml @@ -18,7 +18,6 @@ -