Skip to content

Commit

Permalink
chore(*) split the Cargo workspace between lib/ and t/lib/
Browse files Browse the repository at this point in the history
To better manage automated dependencies and security updates, and help
distinguish high-priority vs low-priority alerts.
  • Loading branch information
thibaultcha committed Dec 22, 2023
1 parent 452aad0 commit f56a7e6
Show file tree
Hide file tree
Showing 13 changed files with 380 additions and 50 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ jobs:
- name: 'Rust lint'
if: ${{ !env.ACT }}
run: |
cargo clippy --all-features
cd lib/ngx-wasm-rs && cargo clippy --all-features
cargo clippy --all-features --manifest-path lib/Cargo.toml
cargo clippy --all-features --manifest-path t/lib/Cargo.toml
- run: |
if [[ $(make reindex 2>&1 | tee reindex.out | grep -c done) -gt 0 ]]; then
cat reindex.out >&2
Expand Down
18 changes: 0 additions & 18 deletions Cargo.toml

This file was deleted.

4 changes: 1 addition & 3 deletions auto/cargo
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ if [ $ngx_found = no ]; then
exit 1
fi

echo "$0: warning: the following functionality is not available for $ngx_addon_name:"
echo " $ngx_wasm_cargo_defines"
echo
echo "$0: warning: the following functionality is not available for $ngx_addon_name: $ngx_wasm_cargo_defines"

have=NGX_WASM_CARGO_FAILED value=1 . auto/define
fi
Expand Down
331 changes: 331 additions & 0 deletions lib/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[workspace]
members = [
"ngx-rust",
"ngx-wasm-rs",
]
6 changes: 1 addition & 5 deletions lib/ngx-wasm-rs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "ngx-wasm"
name = "ngx-wasm-rs"
version = "0.1.0"
authors = ["Hisham Muhammad <[email protected]>"]
edition = "2018"
Expand All @@ -14,7 +14,3 @@ wat = ["dep:ngx-wasm-wat"]
[lib]
name = "ngx_wasm_rs"
crate-type = ["staticlib", "cdylib"]

[workspace]
# not in a workspace

File renamed without changes.
Loading

0 comments on commit f56a7e6

Please sign in to comment.