Skip to content

Commit

Permalink
Fix cargo vendor usage to work with workspaces
Browse files Browse the repository at this point in the history
Using `Cargo.full.toml` instead of `Cargo.toml` upset `cargo vendor`:

```

$ cargo vendor -s Cargo.full.toml > config.tmp
error: package `differential-datalog/rust/template/cmd_parser/Cargo.toml` is a member of the wrong workspace
expected: differential-datalog/rust/template/Cargo.full.toml
actual:   differential-datalog/rust/template/Cargo.toml
```
  • Loading branch information
ryzhyk authored Sep 19, 2019
1 parent e57bf6c commit 5dea310
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ before_deploy:
# Include Rust dependencies for offline build
- cd rust/template
- cat Cargo.toml `find ../../lib/ -name "*.toml"` > Cargo.full.toml
- cp Cargo.full.toml Cargo.toml
# Set relative path to vendor directory in `.cargo/config`
- cargo vendor -s Cargo.full.toml > config.tmp
- cargo vendor -s Cargo.toml > config.tmp
- if [ `uname -s` = Darwin ]; then ghead -n -1 config.tmp > config; else head -n -1 config.tmp > config; fi
- echo "directory = \"vendor\"" >> config
- cp -r vendor "../../$DIST_DIR/"
Expand Down

0 comments on commit 5dea310

Please sign in to comment.