From 1ec42358a9c764b7de37cc378157995906cc46f0 Mon Sep 17 00:00:00 2001
From: Michiel Kodde <mkodde@ibuildings.nl>
Date: Wed, 17 Jan 2024 11:40:19 +0100
Subject: [PATCH] Update test-integration.yml

---
 .github/workflows/test-integration.yml | 45 +++++++++++---------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 4932f4601..f9493c986 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -1,35 +1,26 @@
-name: test-integration
+name: Run QA tests (static analysis, lint and unit tests)
 on:
   pull_request:
   push:
     branches: [ master, develop, feature/*, bugfix/* ]
+
 jobs:
-  build:
+  run-qa-tests:
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    defaults:
+      run:
+        working-directory: /var/www/html/
+    container:
+      image:  ghcr.io/openconext/openconext-basecontainers/php72-apache2-node16-composer2:latest
+      volumes:
+        - .:/var/www/html
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: Init environment
-        run: |
-          cd ci/docker
-          docker-compose up -d
-      - name: Install dependencies
-        run: |
-          cd ci/docker && docker-compose exec -T stepup-middleware bash -lc '
-          composer install
-          '
-      - name: Run test scripts
-        run: cd ci/docker && docker-compose exec -T stepup-middleware bash -lc ' composer test '
-      - name: Output log files on failure
-        if: failure()
-        run: |
-          tail -2000 /var/log/syslog 
+        uses: actions/checkout@v2
+
+      - name: Composer install
+        run: composer install
+
+      - name: Run QA tests
+        run: composer check