Merge pull request #687 from neon-bindings/kv/cargo-cp-artifact

Switch N-API tests to `cargo-cp-artifact` from `neon-build`
neon-bindings · Feb 24, 2021 · ff0593b · ff0593b
2 parents eabe090 + 19e2c4a
commit ff0593b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 24 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -34,7 +34,7 @@ jobs:
       if: ${{ matrix.node-version == '15.x' }}
       run: npm install -g npm@6
     - name: Install libclang
-      uses: KyleMayes/install-llvm-action@01144dc
+      uses: KyleMayes/install-llvm-action@01144dc97b1e2693196c3056414a44f15180648b
       with:
         version: "10"
         directory: ${{ runner.temp }}/llvm

diff --git a/test/electron/Cargo.toml b/test/electron/Cargo.toml
@@ -4,15 +4,10 @@ version = "0.1.0"
 edition = "2018"
 authors = ["The Neon Community"]
 license = "MIT/Apache-2.0"
-build = "build.rs"
 
 [lib]
-name = "electron_tests"
 crate-type = ["cdylib"]
 
-[build-dependencies]
-neon-build = {version = "*", path = "../../crates/neon-build"}
-
 [dependencies.neon]
 version = "*"
 path = "../.."

diff --git a/test/electron/build.rs b/test/electron/build.rs
diff --git a/test/electron/package-lock.json b/test/electron/package-lock.json
diff --git a/test/electron/package.json b/test/electron/package.json
@@ -6,12 +6,13 @@
   "author": "The Neon Community",
   "license": "MIT",
   "scripts": {
-    "install": "cargo build -p electron-tests --release",
+    "install": "cargo-cp-artifact -nc index.node -- cargo build --message-format=json-render-diagnostics",
     "start": "electron .",
     "test": "node test"
   },
   "repository": "https://github.com/electron/electron-quick-start",
   "devDependencies": {
+    "cargo-cp-artifact": "^0.1.0 ",
     "electron": "^11.0.3",
     "spectron": "^13.0.0"
   }

diff --git a/test/napi/Cargo.toml b/test/napi/Cargo.toml
@@ -1,19 +1,14 @@
 [package]
-name = "napi"
+name = "napi-tests"
 version = "0.1.0"
 authors = ["The Neon Community <david.herman@gmail.com>"]
 license = "MIT"
-build = "build.rs"
 exclude = ["artifacts.json", "index.node"]
 edition = "2018"
 
 [lib]
-name = "napi"
 crate-type = ["cdylib"]
 
-[build-dependencies]
-neon-build = {version = "*", path = "../../crates/neon-build"}
-
 [dependencies.neon]
 version = "*"
 path = "../.."

diff --git a/test/napi/build.rs b/test/napi/build.rs
diff --git a/test/napi/package-lock.json b/test/napi/package-lock.json
diff --git a/test/napi/package.json b/test/napi/package.json
@@ -5,10 +5,11 @@
   "author": "The Neon Community",
   "license": "MIT",
   "scripts": {
-    "install": "cargo build -p napi --release",
+    "install": "cargo-cp-artifact -nc index.node -- cargo build --message-format=json-render-diagnostics",
     "test": "mocha --expose-gc --timeout 5000 --recursive lib"
   },
   "devDependencies": {
+    "cargo-cp-artifact": "^0.1.0",
     "chai": "^4.2.0",
     "mocha": "^8.1.0"
   }