From 7a73c0170c7af36e78bbacc16a9a3387ad9169af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 24 Dec 2015 15:16:04 +0100
Subject: [PATCH] set a composer root version + select image php-7

The composer root version is required to let composer decide on which branch he is, as we have mirrored dependencies (custom field requires person, which requires custom field).

The php 7 build select now php 7 image
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f2233cb5..50a37acc8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ services:
  
 before_script:
    - composer config github-oauth.github.com $GITHUB_TOKEN
+   - if [ $CI_BUILD_REF_NAME = "1.0" ] ; then export COMPOSER_ROOT_VERSION="1.0-dev"; else export COMPOSER_ROOT_VERSION="dev-master"; fi
    - composer install --no-interaction
    - cp Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml Tests/Fixtures/App/app/config/parameters.yml
    - ./console.sh --env=test cache:warmup
@@ -14,4 +15,5 @@ test:php-5.6:
    script: phpunit --testdox
 test:php-7:
    stage: test
+   image: chill/ci-image:php-7
    script: phpunit --testdox