From ba52eb34c7162ca0e7484078909b2d2a29a2dbf5 Mon Sep 17 00:00:00 2001
From: idanoo <daniel@m2.nz>
Date: Tue, 7 Feb 2023 14:20:30 +1300
Subject: [PATCH] Update gitlab CI

---
 .gitlab-ci.yml        | 27 ++++++++++-----------------
 .woodpecker/.lint.yml |  8 --------
 .woodpecker/.test.yml | 26 --------------------------
 3 files changed, 10 insertions(+), 51 deletions(-)
 delete mode 100644 .woodpecker/.lint.yml
 delete mode 100644 .woodpecker/.test.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1e395f..d681cb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,22 +16,15 @@
   wget https://getcomposer.org/composer.phar
   php composer.phar install --dev
 
-services:
-  - redis:latest
-
-# Test PHP 7.4
-test:7.4:
-  image: php:7.4
-  before_script:
-    - *docker_boostrap
-  script:
-    - php vendor/bin/phpunit --verbose --configuration phpunit.xml
-  tags:
-    - docker
-
-# Test PHP 8.0
-test:8.1:
-  image: php:8.1
+# Test PHP
+test:
+  image: php:$PHP_VERSION
+  services:
+    - redis:$REDIS_VERSION
+  parallel:
+    matrix:
+      - PHP_VERSION: [7.4, 8.0, 8.1, 8.2]
+        REDIS_VERSION: [7]
   before_script:
     - *docker_boostrap
   script:
@@ -41,7 +34,7 @@ test:8.1:
 
 # Codestandards
 lint:
-  image: php:8.1
+  image: php:8.2
   allow_failure: true
   script:
     - apt update && apt install -y wget unzip git
diff --git a/.woodpecker/.lint.yml b/.woodpecker/.lint.yml
deleted file mode 100644
index 6e3f90f..0000000
--- a/.woodpecker/.lint.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-pipeline:
-  lint:
-    image: php:8.1-cli
-    commands:
-      - apt update && apt install -y wget unzip git
-      - wget https://getcomposer.org/download/latest-stable/composer.phar
-      - php composer.phar install --dev
-      - php -d memory_limit=256M vendor/bin/phpcs -s --standard=ruleset.xml
diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml
deleted file mode 100644
index b217f69..0000000
--- a/.woodpecker/.test.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-matrix:
-  PHP_VERSION:
-    - 7.4
-    - 8.0
-    - 8.1
-    - 8.2
-
-pipeline:
-  unit-tests:
-    image: php:${PHP_VERSION}-cli
-    commands:  
-      - apt-get update -yq
-      - apt-get install git wget procps unzip -y
-      - pecl install -o -f redis && rm -rf /tmp/pear
-      - docker-php-ext-enable redis
-      - docker-php-ext-install pcntl
-      - wget https://getcomposer.org/download/latest-stable/composer.phar
-      - php composer.phar install --dev
-      - php vendor/bin/phpunit --verbose --configuration phpunit.xml
-
-services:
-  redis:
-    image: redis:7
-
-depends_on:
-  - lint
\ No newline at end of file