Change duplicate code in CI Workflow to matrix.

Author: Potherca

.github/workflows/ci.yml

@@ -9,7 +9,14 @@ on:
   pull_request:
     branches: [ main ]
 
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
+  # @TODO: Instead of building the docker image here, take a pre-build image and mount the code (only build when the Dockerfile changes)
   docker-build-nextcloud:
     runs-on: ubuntu-latest
     steps:
@@ -27,8 +34,15 @@ jobs:
           docker build -t "ghcr.io/pdsinterop/solid-nextcloud:latest" .
           docker push "ghcr.io/pdsinterop/solid-nextcloud:latest"
 
-  # @TODO: Instead of duplicating this code 3 times, use a matrix?
-  test-webid-provider:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          - 'solidtestsuite/solid-crud-tests:v6.0.0'
+          - 'solidtestsuite/web-access-control-tests:v7.1.0'
+          - 'solidtestsuite/webid-provider-tests:v2.1.0'
+
     needs:
       - docker-build-nextcloud
 
@@ -46,7 +60,7 @@ jobs:
       - name: Run Solid webid-provider test suite
         run: |
           docker pull michielbdejong/nextcloud-cookie
-          docker pull solidtestsuite/webid-provider-tests:v2.1.0
+          docker pull ${{ matrix.test }}
           docker pull ghcr.io/pdsinterop/solid-nextcloud:latest
           docker pull ghcr.io/pdsinterop/php-solid-pubsub-server:latest
 
@@ -62,72 +76,4 @@ jobs:
             --env COOKIE_ALICE="$COOKIE_server" \
             --env COOKIE_BOB="$COOKIE_thirdparty" \
             --env-file ./env-vars-testers.list \
-            solidtestsuite/webid-provider-tests:v2.1.0
-
-  test-solid-crud:
-    needs:
-      - docker-build-nextcloud
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run Solid solid-crud test suite
-        run: |
-          docker pull michielbdejong/nextcloud-cookie
-          docker pull solidtestsuite/solid-crud-tests:v6.0.0
-
-          docker network create testnet
-          docker run -i --network=testnet -d --name pubsub ghcr.io/pdsinterop/php-solid-pubsub-server:latest
-
-          source ./run-solid-test-suite.sh
-          startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
-          startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
-
-          docker run -i --rm --network=testnet \
-            --env COOKIE="$COOKIE_server" \
-            --env COOKIE_ALICE="$COOKIE_server" \
-            --env COOKIE_BOB="$COOKIE_thirdparty" \
-            --env-file ./env-vars-testers.list \
-            solidtestsuite/solid-crud-tests:v6.0.0
-
-  test-web-access-control:
-    needs:
-      - docker-build-nextcloud
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run Solid web-access-control test suite
-        run: |
-          docker pull michielbdejong/nextcloud-cookie
-          docker pull solidtestsuite/web-access-control-tests:v7.1.0
-
-          docker network create testnet
-          docker run -i --network=testnet -d --name 'pubsub' "ghcr.io/pdsinterop/php-solid-pubsub-server:latest"
-
-          source ./run-solid-test-suite.sh
-          startSolidNextcloud 'server' "ghcr.io/pdsinterop/solid-nextcloud:latest"
-          startSolidNextcloud 'thirdparty' "ghcr.io/pdsinterop/solid-nextcloud:latest"
-
-          docker run -i --rm --network=testnet \
-            --env COOKIE="$COOKIE_server" \
-            --env COOKIE_ALICE="$COOKIE_server" \
-            --env COOKIE_BOB="$COOKIE_thirdparty" \
-            --env-file ./env-vars-testers.list \
-            solidtestsuite/web-access-control-tests:v7.1.0
+            ${{ matrix.test }}