From b182b438026c86b98823b5e6d5e15936d13ebd42 Mon Sep 17 00:00:00 2001
From: Chengzhong Wu <cwu631@bloomberg.net>
Date: Thu, 9 May 2024 11:10:48 +0100
Subject: [PATCH 1/3] ci: add node-integration

---
 .github/workflows/nodejs-windows.yml | 32 ---------------
 .github/workflows/nodejs.yml         | 60 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/nodejs-windows.yml
 create mode 100644 .github/workflows/nodejs.yml

diff --git a/.github/workflows/nodejs-windows.yml b/.github/workflows/nodejs-windows.yml
deleted file mode 100644
index 3f52ff9c..00000000
--- a/.github/workflows/nodejs-windows.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Node.js Windows integration
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-  workflow_dispatch:
-
-jobs:
-  build-windows:
-    runs-on: windows-latest
-    steps:
-      - name: Clone gyp-next
-        uses: actions/checkout@v4
-        with:
-          path: gyp-next
-      - name: Clone nodejs/node
-        uses: actions/checkout@v4
-        with:
-          repository: nodejs/node
-          path: node
-      - name: Install deps
-        run: choco install nasm
-      - name: Replace gyp in Node.js
-        run: |
-          rm -Recurse node/tools/gyp
-          cp -Recurse gyp-next node/tools/gyp
-      - name: Build Node.js
-        run: |
-          cd node
-          ./vcbuild.bat
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
new file mode 100644
index 00000000..38a8a690
--- /dev/null
+++ b/.github/workflows/nodejs.yml
@@ -0,0 +1,60 @@
+name: Node.js integration
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  integration:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
+        python: ["3.8", "3.10", "3.12", "3.13"]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Clone gyp-next
+        uses: actions/checkout@v4
+        with:
+          path: gyp-next
+      - name: Clone nodejs/node
+        uses: actions/checkout@v4
+        with:
+          repository: nodejs/node
+          path: node
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python }}
+          allow-prereleases: true
+
+      # macOS and Linux
+      - name: Replace gyp in Node.js
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          rm -rf node/tools/gyp
+          cp -r gyp-next node/tools/gyp
+      - name: Run configure
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          cd node
+          ./configure
+
+      # Windows
+      - name: Install deps
+        if: runner.os == 'Windows'
+        run: choco install nasm
+      - name: Replace gyp in Node.js
+        if: runner.os == 'Windows'
+        run: |
+          rm -Recurse node/tools/gyp
+          cp -Recurse gyp-next node/tools/gyp
+      - name: Run configure
+        if: runner.os == 'Windows'
+        run: |
+          cd node
+          ./vcbuild.bat nobuild

From b271aa48befe28e8e3932d207f71f34f214cd39f Mon Sep 17 00:00:00 2001
From: Chengzhong Wu <legendecas@gmail.com>
Date: Thu, 9 May 2024 19:18:27 +0100
Subject: [PATCH 2/3] fixup! ci: add node-integration

---
 .github/workflows/nodejs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 38a8a690..ea8b9169 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
-        python: ["3.8", "3.10", "3.12", "3.13"]
+        python: ["3.8", "3.10", "3.12"]
 
     runs-on: ${{ matrix.os }}
     steps:

From 1af641b285758d4be76b33eb75053a056af84b95 Mon Sep 17 00:00:00 2001
From: Chengzhong Wu <cwu631@bloomberg.net>
Date: Thu, 30 May 2024 17:36:49 +0100
Subject: [PATCH 3/3] fixup! ci: add node-integration

---
 .github/workflows/nodejs.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index ea8b9169..9357bda5 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -29,17 +29,15 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true
-
-      # macOS and Linux
       - name: Replace gyp in Node.js
-        if: runner.os != 'Windows'
         shell: bash
         run: |
           rm -rf node/tools/gyp
           cp -r gyp-next node/tools/gyp
+
+      # macOS and Linux
       - name: Run configure
         if: runner.os != 'Windows'
-        shell: bash
         run: |
           cd node
           ./configure
@@ -48,11 +46,6 @@ jobs:
       - name: Install deps
         if: runner.os == 'Windows'
         run: choco install nasm
-      - name: Replace gyp in Node.js
-        if: runner.os == 'Windows'
-        run: |
-          rm -Recurse node/tools/gyp
-          cp -Recurse gyp-next node/tools/gyp
       - name: Run configure
         if: runner.os == 'Windows'
         run: |