From 3f7711dd204f03dc7dc53a355aec3833611aced1 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Mon, 18 Jul 2016 09:55:06 -0400 Subject: [PATCH] Gitlab CI take two --- .gitlab-ci.yml | 10 ++++++++++ build/docker_install.sh | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b74a5032..718b39a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,16 @@ before_script: # Install dependencies - bash build/docker_install.sh > /dev/null + # Install composer dependencies + - curl -sS https://getcomposer.org/installer | php + - php composer.phar install + +# Composer stores all downloaded packages in the vendor/ directory. +# Do not use the following if the vendor/ directory is commited to +# your git repository. +cache: + paths: + - vendor/ services: - redis:latest diff --git a/build/docker_install.sh b/build/docker_install.sh index f2c8e053..784e6a34 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -6,9 +6,7 @@ set -xe # Install git (the php image doesn't have it) which is required by composer -# And for some reason apt-utils is not installed apt-get update -yqq -apt-get install apt-utils apt-get install git sqlite3 -yqq # Install phpunit, the tool that we will use for testing