Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node.js 15 support (legacy) #623

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Node.js 15 support (legacy) #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
11 changes: 8 additions & 3 deletions crates/neon-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading