From a717c00b7b84943623af26b23cfc1fbe8de7e29a Mon Sep 17 00:00:00 2001 From: Alex Anderson <191496+alxndrsn@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:05:15 +0300 Subject: [PATCH] chore (ci): add node v20 to build matrix (#3148) * chore (ci): add node v20 to build matrix * skip pg-native tests on node 20 --------- Co-authored-by: alxndrsn --- .github/workflows/ci.yml | 2 ++ packages/pg/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f93b816d..b40ea52b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,7 @@ jobs: - '14' - '16' - '18' + - '20' os: - ubuntu-latest name: Node.js ${{ matrix.node }} (${{ matrix.os }}) @@ -54,6 +55,7 @@ jobs: PGTESTNOSSL: 'true' SCRAM_TEST_PGUSER: scram_test SCRAM_TEST_PGPASSWORD: test4scram + TEST_SKIP_NATIVE: ${{ matrix.node == 20 }} steps: - name: Show OS run: | diff --git a/packages/pg/Makefile b/packages/pg/Makefile index d31fe9301..f8593bcac 100644 --- a/packages/pg/Makefile +++ b/packages/pg/Makefile @@ -39,10 +39,14 @@ test-missing-native: test-native: test-connection @echo "***Testing native bindings***" +ifeq ($(TEST_SKIP_NATIVE), true) + @echo "***Skipping tests***" +else @npm i --no-save pg-native @find test/native -name "*-tests.js" | $(node-command) @find test/integration -name "*-tests.js" | $(node-command) native @npm uninstall pg-native +endif test-integration: test-connection @echo "***Testing Pure Javascript***"