From 083cf35de209955149f02a04633d8e4e66857ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 1 Oct 2015 21:13:40 +0200 Subject: [PATCH 1/9] Fix gitlab-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 351ac55a0..33b6d79f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ services: - - postgresql + - postgres before_script: From 799cd6132b46f4587a4ab4a83497288da4e91b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 1 Oct 2015 21:28:45 +0200 Subject: [PATCH 2/9] fix postgres version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33b6d79f3..77f7b66ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ services: - - postgres + - postgres:9.4 before_script: From 5d1efa13ea47d49cd604c1880cd973d151e2ba82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 3 Oct 2015 01:12:48 +0200 Subject: [PATCH 3/9] install git on image --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77f7b66ad..12fc9e5a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,11 @@ +image: chill/standard-fpm services: - postgres:9.4 before_script: + - cd /tmp + - apt-get install -qy git - composer install --dev - cp Tests/Fixtures/App/config/parameters.travis.yml Tests/Fixtures/App/config/parameters.yml - psql -c 'create database test0;' -U postgres From 8e9dfaac7f55284f50421552ab1792490e78cc7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 3 Oct 2015 01:19:41 +0200 Subject: [PATCH 4/9] try to fix docker image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12fc9e5a4..7c6a1ef2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: chill/standard-fpm +image: chill/standard-fpm:latest services: - postgres:9.4 From 6eefd24ea4c1f3c10eb56b4d8993f5dbdbcec2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 16 Oct 2015 23:24:28 +0200 Subject: [PATCH 5/9] try to start gitlab --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c6a1ef2d..55ffeca98 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,10 @@ -image: chill/standard-fpm:latest services: - postgres:9.4 before_script: - - cd /tmp - - apt-get install -qy git - composer install --dev - - cp Tests/Fixtures/App/config/parameters.travis.yml Tests/Fixtures/App/config/parameters.yml - - psql -c 'create database test0;' -U postgres + - cp Tests/Fixtures/App/config/parameters.gitlab-ci.yml Tests/Fixtures/App/config/parameters.yml - php Tests/Fixtures/App/console --env=test cache:warmup - php Tests/Fixtures/App/console doctrine:migrations:migrate --env=test --no-interaction - php Tests/Fixtures/App/console doctrine:fixtures:load --env=test --no-interaction From 7da0d9373e180897fde735e538687e7a36bfe835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 16 Oct 2015 23:34:46 +0200 Subject: [PATCH 6/9] add a parameter file for CI --- Tests/Fixtures/App/config/parameters.gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Tests/Fixtures/App/config/parameters.gitlab-ci.yml diff --git a/Tests/Fixtures/App/config/parameters.gitlab-ci.yml b/Tests/Fixtures/App/config/parameters.gitlab-ci.yml new file mode 100644 index 000000000..232b67894 --- /dev/null +++ b/Tests/Fixtures/App/config/parameters.gitlab-ci.yml @@ -0,0 +1,11 @@ +parameters: + database_host: 127.0.0.1 + database_port: 5432 + database_name: postgres + database_user: postgres + database_password: postgres + locale: fr + secret: ThisTokenIsNotSoSecretChangeIt + debug_toolbar: true + debug_redirects: false + use_assetic_controller: true \ No newline at end of file From ce5d09e79dc77d8a598d0d8b6a116d98e66d4999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 16 Oct 2015 23:47:36 +0200 Subject: [PATCH 7/9] try another host --- Tests/Fixtures/App/config/parameters.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Fixtures/App/config/parameters.gitlab-ci.yml b/Tests/Fixtures/App/config/parameters.gitlab-ci.yml index 232b67894..df4c11b68 100644 --- a/Tests/Fixtures/App/config/parameters.gitlab-ci.yml +++ b/Tests/Fixtures/App/config/parameters.gitlab-ci.yml @@ -1,5 +1,5 @@ parameters: - database_host: 127.0.0.1 + database_host: postgres database_port: 5432 database_name: postgres database_user: postgres From 45ad577e8b24cf16e6a79e8d9650068e014dd3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 17 Oct 2015 00:15:46 +0200 Subject: [PATCH 8/9] adding auth to composer on build and add php-7 --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55ffeca98..b44fccb86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,12 +3,16 @@ services: before_script: - - composer install --dev + - export GITHUB_COMPOSER_AUTH=$GITHUB_COMPOSER_AUTH + - composer install - cp Tests/Fixtures/App/config/parameters.gitlab-ci.yml Tests/Fixtures/App/config/parameters.yml - php Tests/Fixtures/App/console --env=test cache:warmup - php Tests/Fixtures/App/console doctrine:migrations:migrate --env=test --no-interaction - php Tests/Fixtures/App/console doctrine:fixtures:load --env=test --no-interaction -job1: +test:php-5.6: stage: test - script: phpunit --coverage-text \ No newline at end of file + script: phpunit --testdox-test +test:php-7: + stage: test + script: phpunit --testdox-text \ No newline at end of file From 675896b5df469c75e1e0644467eac1aaa9872e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Sat, 17 Oct 2015 00:26:40 +0200 Subject: [PATCH 9/9] fix phpunit command and github token --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b44fccb86..a977dc9a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ services: before_script: - - export GITHUB_COMPOSER_AUTH=$GITHUB_COMPOSER_AUTH + - export GITHUB_COMPOSER_AUTH=$GITHUB_TOKEN - composer install - cp Tests/Fixtures/App/config/parameters.gitlab-ci.yml Tests/Fixtures/App/config/parameters.yml - php Tests/Fixtures/App/console --env=test cache:warmup @@ -12,7 +12,7 @@ before_script: test:php-5.6: stage: test - script: phpunit --testdox-test + script: phpunit --testdox test:php-7: stage: test - script: phpunit --testdox-text \ No newline at end of file + script: phpunit --testdox \ No newline at end of file