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.

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

Replace neon-cli with cargo-cp-artifact #276

Merged
merged 3 commits into from
Mar 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,8 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: rustup target add wasm32-unknown-unknown && cargo build --target wasm32-unknown-unknown

- name: Cargo build 'native' package
run: |
# Install npm packages
npm ci
# Since the 'install' script in package.json has already run `neon build`,
# a second `cargo build` may not catch any additional errors. If someone
# who knows how neon works confirms that, we could remove the following lines:
cd native
cargo build --all-features --all-targets
- name: Build npm package
run: npm ci

- name: Cargo fuzz
# Only runs on one runner for a few reasons:
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
.vscode/
.DS_Store
project.code-workspace
native/target
native/index.node
native/artifacts.json
js/target
js/index.node
js/artifacts.json
**/*~
**/node_modules
**/.DS_Store
**/target/
ignored/
NDK/
.cargo
.cargo
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ It may be a good fit for yours, too!

See [docs.rs](https://docs.rs/adblock) for detailed API documentation.

Also check the [Rust example](./examples/example.rs) or the [NodeJS example](./native/example.js).
Also check the [Rust example](./examples/example.rs) or the [NodeJS example](./js/example.js).

### Optional features

Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion native/Cargo.toml → js/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ license = "MPL-2.0"
exclude = ["artifacts.json", "index.node"]

[lib]
name = "adblock_rs"
crate-type = ["cdylib"]

[dependencies]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading