From dd2d6da3f3fbb4aa28f3ab60899deea9b4d9deb1 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 2 Jun 2016 12:05:52 +1000 Subject: [PATCH] Testing gitlab runner configuration --- ci/docker_install.sh | 22 ---------------------- modules/lnapp | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 ci/docker_install.sh diff --git a/ci/docker_install.sh b/ci/docker_install.sh deleted file mode 100644 index 8b46571a..00000000 --- a/ci/docker_install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# We need to install dependencies only for Docker -[[ ! -e /.dockerenv ]] && [[ ! -e /.dockerinit ]] && exit 0 - -set -xe - -# Install git (the php image doesn't have it) which is required by composer -apt-get update -yqq -apt-get install git -yqq - -# Install phpunit, the tool that we will use for testing -if php -r 'if (preg_replace("/([0-9]+)\.([0-9]+).*/","$1.$2",PHP_VERSION) != 5.5) die(1);' ; then - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit-4.8.phar #php5.5 -else - curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar -fi -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 diff --git a/modules/lnapp b/modules/lnapp index 6a33249a..8f659c50 160000 --- a/modules/lnapp +++ b/modules/lnapp @@ -1 +1 @@ -Subproject commit 6a33249a95ea484dd60470edc3b38f85ff5e1340 +Subproject commit 8f659c50c675c427e60a103a19fd3415d0cbbd07