Skip to content

Commit a719dab

Browse files
committed
[misc] CI correction to use deno latest 2.x version
1 parent 0837d87 commit a719dab

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
name: build matrix
3737
uses: mariadb-corporation/connector-ci-build-matrix@main
3838
with:
39-
additional-matrix: '[{"name": "MariaDB 11.4", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "node": 24}, {"name": "MariaDB 11.4", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "node": 20}, {"name": "MariaDB 11.4 - DENO", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "deno": "lts"}]'
39+
additional-matrix: '[{"name": "MariaDB 11.4", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "node": 24}, {"name": "MariaDB 11.4", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "node": 20}, {"name": "MariaDB 11.4 - DENO", "os": "ubuntu-latest", "db-type": "community", "db-tag": "11.4", "deno": "v2.x"}]'
4040

4141
ci:
4242
name: ${{ matrix.name }}${{ !matrix.deno && matrix.node != 22 && format(' - node {0}', matrix.node) || '' }}

test/integration/ssl.test.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,7 @@ describe.concurrent('ssl', function () {
226226

227227
// test will work either because a server certificate chain is trusted (not don in tests)
228228
// or using mariadb ephemeral certificate validation
229-
if (
230-
!shareConn.info.isMariaDB() ||
231-
!shareConn.info.hasMinVersion(11, 4, 0) ||
232-
shareConn.info.hasMinVersion(23, 0, 0)
233-
)
234-
return skip();
229+
if (!shareConn.info.isMariaDB() || !shareConn.info.hasMinVersion(11, 4, 0) || isDeno()) return skip();
235230
if (!Conf.baseConfig.password) return skip();
236231
const conn = await createConnection({
237232
user: 'sslTestUser',
@@ -249,12 +244,7 @@ describe.concurrent('ssl', function () {
249244

250245
// test will work either because a server certificate chain is trusted (not done in tests)
251246
// or using mariadb ephemeral certificate validation
252-
if (
253-
!shareConn.info.isMariaDB() ||
254-
!shareConn.info.hasMinVersion(11, 4, 0) ||
255-
shareConn.info.hasMinVersion(23, 0, 0)
256-
)
257-
return skip();
247+
if (!shareConn.info.isMariaDB() || !shareConn.info.hasMinVersion(11, 4, 0) || isDeno()) return skip();
258248
if (!Conf.baseConfig.password) return skip();
259249

260250
const conn = await createConnection({
@@ -529,7 +519,7 @@ describe.concurrent('ssl', function () {
529519
} catch (e) {
530520
// eat
531521
}
532-
if (success && (!shareConn.info.isMariaDB() || !shareConn.info.hasMinVersion(11, 4, 0))) {
522+
if (!isDeno() && success && (!shareConn.info.isMariaDB() || !shareConn.info.hasMinVersion(11, 4, 0))) {
533523
throw new Error('Must have thrown an exception, since server identity must not have been verified !');
534524
}
535525
});

0 commit comments

Comments
 (0)