Merge branch 'main' into moar-tests

newrelic · Jul 20, 2023 · 16f5fc9 · 16f5fc9
2 parents 56dce51 + c6b4221
commit 16f5fc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -36,7 +36,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -72,7 +72,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3
@@ -110,24 +110,14 @@ jobs:
     # Once compatible, can remove node-gyp upgrade.
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Get Node Version
-      id: node_version
-      run: echo "::set-output name=version::$(node --version | sed 's/^.//')"
-
-    # https://github.com/nodejs/node-gyp/blob/master/docs/Updating-npm-bundled-node-gyp.md#windows
-    - name: Upgrade node-gyp in npm
-      run: |
-        cd "C:\hostedtoolcache\windows\node\${{ steps.node_version.outputs.version }}\x64"
-        cd node_modules\npm\node_modules\@npmcli\run-script
-        npm install node-gyp@>=8.4.0
     - name: Install Dependencies
       run: npm ci
     - name: Rebuild

diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3