From b6229770995725239b26ceb7bdae77e7452ce01a Mon Sep 17 00:00:00 2001
From: wellwelwel <46850407+wellwelwel@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:34:08 -0300
Subject: [PATCH 1/2] ci: remove `mysql:8.0.22` matrix from OSX

---
 .github/workflows/ci-osx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-osx.yml b/.github/workflows/ci-osx.yml
index 4e741ce3c6..ae8279a7ad 100644
--- a/.github/workflows/ci-osx.yml
+++ b/.github/workflows/ci-osx.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [18.x, 20.x]
-        mysql-version: ["mysql:8.0.22", "mysql:8.0.33"]
+        mysql-version: ["mysql:8.0.33"]
         use-compression: [0, 1]
         use-tls: [0]
         mysql_connection_url_key: [""]

From 80638485bbaed2698ec2b9e823c7daa03d0a1905 Mon Sep 17 00:00:00 2001
From: wellwelwel <46850407+wellwelwel@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:04:49 -0300
Subject: [PATCH 2/2] ci: refactor CI - OSX

---
 .github/workflows/ci-osx.yml | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci-osx.yml b/.github/workflows/ci-osx.yml
index ae8279a7ad..8e6ae9d604 100644
--- a/.github/workflows/ci-osx.yml
+++ b/.github/workflows/ci-osx.yml
@@ -18,24 +18,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [ 20.x]
         mysql-version: ["mysql:8.0.33"]
         use-compression: [0, 1]
-        use-tls: [0]
+        use-tls: [0, 1]
         mysql_connection_url_key: [""]
-        # TODO - add mariadb to the matrix. currently few tests are broken due to mariadb incompatibilities
-        include:
-          # 20.x
-          - node-version: "20.x"
-            mysql-version: "mysql:8.0.33"
-            use-compression: 1
-            use-tls: 0
-            use-builtin-test-runner: 1
-          - node-version: "20.x"
-            mysql-version: "mysql:8.0.33"
-            use-compression: 0
-            use-tls: 1
-            use-builtin-test-runner: 1
     env:
       MYSQL_CONNECTION_URL: ${{ secrets[matrix.mysql_connection_url_key] }}
 
@@ -82,7 +69,3 @@ jobs:
 
       - name: Run tests
         run: FILTER=${{matrix.filter}} MYSQL_USE_TLS=${{ matrix.use-tls }} MYSQL_USE_COMPRESSION=${{ matrix.use-compression }} npm run coverage-test
-
-      - name: Run tests with built-in node test runner
-        if: ${{ matrix.use-builtin-test-runner }}
-        run: FILTER=${{matrix.filter}} MYSQL_USE_TLS=${{ matrix.use-tls }} MYSQL_USE_COMPRESSION=${{ matrix.use-compression }} npm run test:builtin-node-runner