Node.js 15 support (legacy) (#623)

neon-bindings · Nov 24, 2020 · 68f136e · 68f136e
1 parent 8aec5b0
commit 68f136e
Show file tree

Hide file tree

Showing 6 changed files with 232 additions and 227 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x, 15.x]
         rust-toolchain: [stable, beta, nightly]
 
     steps:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x, 15.x]
         rust-toolchain: [stable, beta, nightly]
 
     steps:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -15,8 +15,9 @@ jobs:
     runs-on: windows-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x, 15.x]
         rust-toolchain: [stable, beta, nightly]
 
     steps:
@@ -30,6 +31,9 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - name: Use npm v6
+      if: ${{ matrix.node-version == '15.x' }}
+      run: npm install -g npm@6
     - name: Install libclang
       uses: KyleMayes/install-llvm-action@01144dc
       with:

diff --git a/crates/neon-sys/build.rs b/crates/neon-sys/build.rs
@@ -193,12 +193,17 @@ mod build {
                 .join("src")
                 .join("neon.o")
         } else {
-            native_dir
+            let neon_dir = native_dir
                 .join("build")
                 .join(configuration)
                 .join("obj")
-                .join("neon")
-                .join("neon.obj")
+                .join("neon");
+            let object_path = neon_dir.join("src").join("neon.obj");
+            if object_path.exists() {
+                object_path
+            } else {
+                neon_dir.join("neon.obj")
+            }
         };
 
         cc::Build::new().cpp(true).object(object_path).compile("libneon.a");