From a08e8544e465fb4b671d3533d9d1687b3705f6db Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 23 Jan 2020 00:04:45 +1100
Subject: [PATCH] Gitlab CI udpates

---
 .gitlab-ci.yml | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e38c67f..fc14585 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,37 +25,18 @@ cache:
 # This is a basic example for a gem or script which doesn't use
 # services such as redis or postgres
 before_script:
-  # Update packages 
-  #- echo 'deb http://deb.debian.org/debian jessie non-free' >> /etc/apt/sources.list.d/non-free.list
-  #- apt-get update -yqq
-  
   # Add gnupg & zip
   - apt-get update -yqq && apt-get install gnupg2 unzip -yqq
 
-  # Upgrade to Node 12
-  - curl -sL https://deb.nodesource.com/setup_12.x | bash -
-  
   # Install dependencies
-  #- apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev pkg-config libsnmp-dev snmp-mibs-downloader -yqq
-  #- download-mibs
-  - apt-get install git autoconf nodejs -yqq
-
-  # Install php extensions
-  #- docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/
-  #- docker-php-ext-install pdo_mysql bz2 gettext sockets gmp gd pcntl snmp
-  #- docker-php-ext-install mbstring mcrypt pdo_mysql curl json intl gd xml zip bz2 opcache
+  - apt-get install git autoconf -yqq
 
   # Install & enable Xdebug for code coverage reports
   - pecl install xdebug
   - docker-php-ext-enable xdebug
 
   # Install Composer and project dependencies.
-  - curl -sS https://getcomposer.org/installer | php
-  - php composer.phar install 
-
-  # Install Node dependencies.
-  # comment this out if you don't have a node dependency
-  - npm install
+  - composer require doctrine/dbal
 
   # Copy over testing configuration.
   # Don't forget to set the database config in .env.testing correctly
@@ -64,12 +45,6 @@ before_script:
   # DB_USERNAME=root
   # DB_PASSWORD=secret
 
-  # Run npm build
-  # comment this out if you don't have a frontend build
-  # you can change this to to your frontend building script like
-  # npm run build
-  - npm run dev
-
   # Generate an application key. Re-cache.
   - php artisan key:generate --env=testing
   - php artisan config:cache --env=testing