From 689073d657b646b5d01448a6a69f88016f40761b Mon Sep 17 00:00:00 2001 From: Chris de Almeida Date: Wed, 5 Jun 2024 16:25:58 -0500 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20bring=20back=20query=20tests=20for?= =?UTF-8?q?=20node=2021=20(#5690)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 11 +---------- .npmrc | 1 + test/support/utils.js | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) create mode 100644 .npmrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 488d394f..02137e59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,7 +135,7 @@ jobs: - name: Node.js 21.x node-version: "21.6" - + - name: Node.js 22.x node-version: "22.0" @@ -148,15 +148,6 @@ jobs: nvm install --default ${{ matrix.node-version }} dirname "$(nvm which ${{ matrix.node-version }})" >> "$GITHUB_PATH" - - name: Configure npm - run: | - npm config set loglevel error - if [[ "$(npm config get package-lock)" == "true" ]]; then - npm config set package-lock false - else - npm config set shrinkwrap false - fi - - name: Install npm module(s) ${{ matrix.npm-i }} run: npm install --save-dev ${{ matrix.npm-i }} if: matrix.npm-i != '' diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..43c97e71 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false diff --git a/test/support/utils.js b/test/support/utils.js index 440a0269..a4d9fb8b 100644 --- a/test/support/utils.js +++ b/test/support/utils.js @@ -77,12 +77,11 @@ function getMajorVersion(versionString) { } function shouldSkipQuery(versionString) { - // Temporarily skipping this test on 21 and 22 + // Temporarily skipping this test on 22 // update this implementation to run on those release lines on supported versions once they exist // upstream tracking https://github.com/nodejs/node/pull/51719 // express tracking issue: https://github.com/expressjs/express/issues/5615 var majorsToSkip = { - "21": true, "22": true } return majorsToSkip[getMajorVersion(versionString)]