From 0d13d8e078f8ba03086bd561f099d09686750b75 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Mon, 18 Jul 2016 11:12:03 -0400 Subject: [PATCH] Another attempt at gitlab ci --- .gitlab-ci.yml | 10 ---------- build/docker_install.sh | 5 +---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fe9d53..2d155c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,16 +15,6 @@ variables: POSTGRES_USER: test POSTGRES_PASSWORD: test -test:5.4: - image: php:5.4 - script: - - phpunit -c build - -test:5.5: - image: php:5.5 - script: - - phpunit -c build - test:5.6: image: php:5.6 script: diff --git a/build/docker_install.sh b/build/docker_install.sh index 4425001..df3cfc9 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -6,10 +6,8 @@ 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 sqlite -yqq +apt-get install git libpq-dev libmysqlclient18 -yqq # Install phpunit, the tool that we will use for testing curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar @@ -18,7 +16,6 @@ chmod +x /usr/local/bin/phpunit # Install mysql driver # Here you can install any other extension that you need docker-php-ext-install pdo_mysql -docker-php-ext-install pdo_sqlite docker-php-ext-install pdo_postgre #docker-php-ext-install pdo_oci docker-php-ext-install interbase