From a1379cbc06288d809ca3756316ce1e8d6cb92695 Mon Sep 17 00:00:00 2001
From: Weyert de Boer <7049+weyert@users.noreply.github.com>
Date: Sat, 10 Aug 2024 23:40:56 +0100
Subject: [PATCH] Revert "ci: temporary try to run all tests even when some
 other fail"

This reverts commit a182f61fa95a9c5978f1fd1eb2d5fe11e240309f.
---
 .github/workflows/test-template.yml | 23 ++++++++++----------
 .github/workflows/test.yml          | 33 +++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml
index 93098b4a0..7f8e3c6ff 100644
--- a/.github/workflows/test-template.yml
+++ b/.github/workflows/test-template.yml
@@ -21,7 +21,6 @@ jobs:
   test:
     name: "Runner (${{ inputs.runner }}) / Node (${{ inputs.node-version }}) / Runtime (${{ inputs.container-runtime }}) / Workspace (${{ inputs.workspace }})"
     runs-on: ${{ inputs.runner }}
-    continue-on-error: true
     steps:
       - name: Docker rootless setup 1/2
         if: ${{ inputs.container-runtime == 'docker-rootless' }}
@@ -71,13 +70,13 @@ jobs:
         run: |
           brew install docker docker-compose
           brew install --cask rancher
-
+          
           TIMEOUT_SECS_CLI_TOOLS=60
           TIMEOUT_SECS_USER_SOCKET=300
-
+          
           echo "Open Rancher Desktop app"
           open "/Applications/Rancher Desktop.app"
-
+          
           echo "Wait max of ${TIMEOUT_SECS_CLI_TOOLS}s for Rancher Desktop to create CLI tools"
           for i in $(seq 1 ${TIMEOUT_SECS_CLI_TOOLS}); do
               if [ -e "$HOME/.rd/bin/rdctl" ]; then
@@ -86,12 +85,12 @@ jobs:
               fi
               sleep 1
           done
-
+          
           if [ ! -e "$HOME/.rd/bin/rdctl" ]; then
             echo "Rancher Desktop CLI tools not found"
             exit 1
           fi
-
+          
           echo "Rancher Desktop initialised successfully, now configure the container runtime"
           $HOME/.rd/bin/rdctl set \
             --container-engine.name=moby \
@@ -102,13 +101,13 @@ jobs:
             --virtual-machine.number-cpus=3 \
             --virtual-machine.memory-in-gb=14 \
             || true
-
+          
           echo "Restart Rancher Desktop"
           $HOME/.rd/bin/rdctl shutdown
           $HOME/.rd/bin/rdctl start
-
+          
           echo "Wait max of ${TIMEOUT_SECS_USER_SOCKET}s for Rancher socket"
-
+          
           for i in $(seq 1 ${TIMEOUT_SECS_USER_SOCKET}); do
               if [ -e "$HOME/.rd/docker.sock" ]; then
                 echo "Rancher Desktop socket created after ${i}s"
@@ -116,14 +115,14 @@ jobs:
               fi
               sleep 1
           done
-
+          
           if [ ! -e "$HOME/.rd/docker.sock" ]; then
             echo "Rancher Desktop socket not found"
             exit 1
           fi
-
+          
           echo "{}" > $HOME/.docker/config.json
-
+          
           echo "DOCKER_HOST=unix://${HOME}/.rd/docker.sock" >> $GITHUB_ENV
           echo "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock" >> $GITHUB_ENV
           echo "NODE_OPTIONS=--dns-result-order=ipv4first" >> $GITHUB_ENV
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e7817167..8fa79d292 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,17 +2,17 @@ name: Test
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
     paths-ignore:
-      - "mkdocs.yml"
-      - "docs/**"
-      - "README.md"
+      - 'mkdocs.yml'
+      - 'docs/**'
+      - 'README.md'
   pull_request:
-    branches: [main]
+    branches: [ main ]
     paths-ignore:
-      - "mkdocs.yml"
-      - "docs/**"
-      - "README.md"
+      - 'mkdocs.yml'
+      - 'docs/**'
+      - 'README.md'
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
@@ -24,8 +24,8 @@ jobs:
     runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        runner: [ubuntu-22.04]
-        node-version: [20.x]
+        runner: [ ubuntu-22.04 ]
+        node-version: [ 18.x, 20.x ]
     steps:
       - name: Code checkout
         uses: actions/checkout@v3
@@ -49,11 +49,13 @@ jobs:
     needs: smoke-test
     strategy:
       matrix:
-        node-version: [20.x]
-        container-runtime: [docker]
+        node-version: [ 18.x, 20.x ]
+        container-runtime: [ docker, podman ]
         include:
           - container-runtime: docker
             runner: ubuntu-22.04
+          - container-runtime: podman
+            runner: ubuntu-22.04
     uses: ./.github/workflows/test-template.yml
     with:
       runner: ${{ matrix.runner }}
@@ -73,12 +75,11 @@ jobs:
         run: echo "modules=$(ls packages/modules | jq -cnR '[inputs | select(length>0) | select(. != "couchbase")]')" >> $GITHUB_OUTPUT
   test-modules:
     name: Module (${{ matrix.module }})
-    needs: [test-testcontainers, list-modules]
+    needs: [ test-testcontainers, list-modules ]
     strategy:
-      fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
-        container-runtime: [docker, podman]
+        node-version: [ 18.x, 20.x ]
+        container-runtime: [ docker, podman ]
         include:
           - container-runtime: docker
             runner: ubuntu-22.04