From 5b64b29bdcd0c81d05b3eaf546cf714f842dbf4d Mon Sep 17 00:00:00 2001
From: jo <ljonas@riseup.net>
Date: Sun, 15 Aug 2021 13:52:48 +0200
Subject: [PATCH] ci: use test matrix for php and python tests

---
 .github/workflows/test.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 654138670..47022fa83 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,8 +25,16 @@ jobs:
       - uses: actions/setup-python@v2
       - uses: pre-commit/action@v2.0.3
 
-  test-bionic:
-    runs-on: ubuntu-18.04
+  test:
+    strategy:
+      matrix:
+        include:
+          - runs-on: ubuntu-18.04
+            python-version: "3.6"
+            php-version: "7.2"
+            prerequisites-script: install-bionic.sh
+
+    runs-on: ${{ matrix.runs-on }}
     env:
       ENVIRONMENT: testing
       LIBRETIME_LOG_DIR: /tmp/log/libretime
@@ -34,7 +42,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: "3.6"
+          python-version: ${{ matrix.python-version }}
       - name: Setup PostgreSQL
         run: |
           sudo systemctl start postgresql.service
@@ -46,9 +54,9 @@ jobs:
       - name: Setup PHP with specific version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "7.2"
+          php-version: ${{ matrix.php-version }}
       - name: Install prerequisites
-        run: sudo -E ./.github/scripts/install-bionic.sh
+        run: sudo -E ./.github/scripts/${{ matrix.prerequisites-script }}
       - name: Run Python tests
         run: |
           sudo ./.github/scripts/python-pkg-install.sh