Windows node gyp issues (vercel#2540)

* Revert "ci(action): workaround windows node-gyp failure (vercel#2504)" This reverts commit 23f3d75. * Fix node-gyp build issue in cargo test pipeline Co-authored-by: Justin Ridgewell <[email protected]>
redonkulus · Nov 2, 2022 · 6a02281 · 6a02281
1 parent ae30a17
commit 6a02281
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/.github/workflows/test-cargo.yml b/.github/workflows/test-cargo.yml
@@ -33,15 +33,7 @@ jobs:
             nextest: linux
           - name: macos-latest
             nextest: mac
-            # Using the `windows-2019` runner instead of latest(`windows-2022`)
-            # because the build was last known working on that version of runner and
-            # `prebuild` fails to find the 2022 Visual Studio install because
-            # it's internally using an old version of `node-gyp`, see
-            # https://github.com/prebuild/prebuild/issues/286
-            #
-            # ref: https://github.com/MadLittleMods/node-usb-detection/blob/ae2fc13e9ad6a09927f4516358dea4c4ca2ceb92/.github/workflows/ci.yml#L18
-            version: 2019
-          - name: windows-2019
+          - name: windows-latest
             nextest: windows-tar
     runs-on: ${{ matrix.os.name }}
     name: test - ${{ matrix.os.name }}
@@ -59,7 +51,7 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-        if: matrix.os.name == 'windows-2019'
+        if: matrix.os.name == 'windows-latest'
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -98,12 +90,12 @@ jobs:
           description: Installing Node.js dependencies...
           url: https://github.com/vercel/turbo/actions/runs/${{ github.run_id }}
 
+      - uses: ./.github/actions/setup-node
+
       - name: Run node-gyp install
-        run: npx node-gyp install
+        run: pnpx node-gyp install
         if: matrix.os.name == 'windows-latest'
 
-      - uses: ./.github/actions/setup-node
-
       - name: Install tests dependencies
         working-directory: crates/turbopack/tests/node-file-trace
         run: pnpm install -r --side-effects-cache false