From edee5626f4c4e30efed46c803556d6d145054257 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 19 Mar 2018 13:04:09 +0100 Subject: [PATCH 1/2] Use own framasoft/framadate-ci image for CI Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec8f868..dc8a46e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,13 @@ -image: php +image: framasoft/framadate-ci stages: - test - deploy - funky -# install zip, git, composer on each build -before_script: - - apt-get update -yqq - - apt-get install zip unzip git -yqq - # Run php-cs-fixer and phpunit on all branches test: stage: test script: - - curl --silent --show-error https://getcomposer.org/installer | php - php composer.phar install -o --no-interaction --no-progress --prefer-dist - mkdir tpl_c - php vendor/bin/php-cs-fixer fix --verbose --dry-run @@ -28,7 +22,6 @@ pages: script: - latesttag=$(git describe --tags) - git checkout ${latesttag} - - curl --silent --show-error https://getcomposer.org/installer | php - php composer.phar install -o --no-interaction --no-progress --prefer-dist --no-dev - php composer.phar dump-autoload --optimize --no-dev --classmap-authoritative - rm -rf composer.phar @@ -50,7 +43,6 @@ funky: stage: funky script: - git checkout funky - - curl --silent --show-error https://getcomposer.org/installer | php - php composer.phar install - mkdir tpl_c - mkdir .public From e9458c18394a9fa75b667eeff8eb9eddc3cef57c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 19 Mar 2018 13:06:31 +0100 Subject: [PATCH 2/2] Move `php composer.phar` to `composer` Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc8a46e..8ba26c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: test: stage: test script: - - php composer.phar install -o --no-interaction --no-progress --prefer-dist + - composer install -o --no-interaction --no-progress --prefer-dist - mkdir tpl_c - php vendor/bin/php-cs-fixer fix --verbose --dry-run - vendor/bin/phpunit --bootstrap app/tests/bootstrap.php --debug app/tests @@ -22,9 +22,8 @@ pages: script: - latesttag=$(git describe --tags) - git checkout ${latesttag} - - php composer.phar install -o --no-interaction --no-progress --prefer-dist --no-dev - - php composer.phar dump-autoload --optimize --no-dev --classmap-authoritative - - rm -rf composer.phar + - composer install -o --no-interaction --no-progress --prefer-dist --no-dev + - composer dump-autoload --optimize --no-dev --classmap-authoritative - mkdir tpl_c - mkdir framadate - mv `ls -A | grep -v framadate` ./framadate @@ -43,7 +42,7 @@ funky: stage: funky script: - git checkout funky - - php composer.phar install + - composer install - mkdir tpl_c - mkdir .public - cp -r * .public