Skip to content

Commit ffc8254

Browse files
authored
Merge pull request #2349 from wellwelwel/osx
ci: refactor CI - OSX
2 parents 2892e44 + 8063848 commit ffc8254

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

.github/workflows/ci-osx.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,11 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
node-version: [18.x, 20.x]
22-
mysql-version: ["mysql:8.0.22", "mysql:8.0.33"]
21+
node-version: [ 20.x]
22+
mysql-version: ["mysql:8.0.33"]
2323
use-compression: [0, 1]
24-
use-tls: [0]
24+
use-tls: [0, 1]
2525
mysql_connection_url_key: [""]
26-
# TODO - add mariadb to the matrix. currently few tests are broken due to mariadb incompatibilities
27-
include:
28-
# 20.x
29-
- node-version: "20.x"
30-
mysql-version: "mysql:8.0.33"
31-
use-compression: 1
32-
use-tls: 0
33-
use-builtin-test-runner: 1
34-
- node-version: "20.x"
35-
mysql-version: "mysql:8.0.33"
36-
use-compression: 0
37-
use-tls: 1
38-
use-builtin-test-runner: 1
3926
env:
4027
MYSQL_CONNECTION_URL: ${{ secrets[matrix.mysql_connection_url_key] }}
4128

@@ -82,7 +69,3 @@ jobs:
8269

8370
- name: Run tests
8471
run: FILTER=${{matrix.filter}} MYSQL_USE_TLS=${{ matrix.use-tls }} MYSQL_USE_COMPRESSION=${{ matrix.use-compression }} npm run coverage-test
85-
86-
- name: Run tests with built-in node test runner
87-
if: ${{ matrix.use-builtin-test-runner }}
88-
run: FILTER=${{matrix.filter}} MYSQL_USE_TLS=${{ matrix.use-tls }} MYSQL_USE_COMPRESSION=${{ matrix.use-compression }} npm run test:builtin-node-runner

0 commit comments

Comments
 (0)