Skip to content

Commit

Permalink
Auto merge of servo#510 - kvark:workspace, r=larsbergstrom
Browse files Browse the repository at this point in the history
Merged all the projects under the Cargo workspace

This will speed up the builds a little. Also added CI testing for the sample/replay binaries.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/510)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Nov 1, 2016
2 parents 85ec8a2 + b2d9706 commit ab40eea
Show file tree
Hide file tree
Showing 12 changed files with 85 additions and 946 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Cargo.lock
target/

2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ addons:
script:
- (cd webrender_traits && cargo test --verbose)
- (cd webrender && cargo test --verbose)
- (cd sample && cargo test --verbose)
- (cd replay && cargo test --verbose)
81 changes: 66 additions & 15 deletions sample/Cargo.lock → Cargo.lock

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

7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[workspace]
members = [
"webrender",
"webrender_traits",
"sample",
"replay",
]
4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ test_script:
- cargo test --verbose
- cd ../webrender
- cargo test --verbose
- cd ../sample
- cargo test --verbose
- cd ../replay
- cargo test --verbose
Loading

0 comments on commit ab40eea

Please sign in to comment.