Skip to content

Commit

Permalink
gather crates into workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
euclio committed Nov 8, 2021
1 parent d1c94b6 commit 1f8e666
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 7 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,29 @@ jobs:
run: cargo build
if: matrix.rust != 'nightly'

- name: "relm: tests"
- name: "relm: test"
run: |
Xvfb :99 &
sleep 3
openbox &
cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture
cargo test -- --nocapture
- name: "relm-derive: tests"
run: |
cargo test --manifest-path relm-derive/Cargo.toml -- --nocapture
- name: "relm: test examples"
- name: "relm-examples: tests"
run: |
Xvfb :99 &
sleep 3
openbox &
cargo test --manifest-path relm-examples/Cargo.toml --examples
cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture
- name: "relm: test buttons-attribute example"
- name: "relm-test: tests"
run: |
cargo test --manifest-path relm-test/Cargo.toml -- --nocapture
- name: "relm: test examples"
run: |
Xvfb :99 &
sleep 3
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
target
/target
Cargo.lock
release.sh
19 changes: 19 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,24 @@ gtk = "^0.14.0"
libc = "^0.2.54"
log = "^0.4.6"

[dev-dependencies]
relm-derive = { path = "relm-derive" }

[features]
hidpi = []

[workspace]
members = [
".",
"relm-derive",
"relm-examples",
"relm-examples/examples/7gui/*",
"relm-test",

# The following must be listed manually instead of "relm-examples/examples/*"
# because of rust-lang/cargo#6745.
"relm-examples/examples/async",
"relm-examples/examples/buttons-attribute",
"relm-examples/examples/http",
"relm-examples/examples/webkit-test",
]
2 changes: 1 addition & 1 deletion relm-examples/tests/include.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl Widget for Win {
}

// Specify a view written in another file.
view!("tests/buttons.relm");
view!("relm-examples/tests/buttons.relm");
}

fn main() {
Expand Down
4 changes: 4 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,13 @@ type InitTestComponents<WIDGET> = (Component<WIDGET>, <WIDGET as WidgetTest>::St
/// # impl WidgetTest for Win {
/// # type Widgets = Win;
/// #
/// # type Streams = ();
/// #
/// # fn get_widgets(&self) -> Self::Widgets {
/// # self.clone()
/// # }
/// #
/// # fn get_streams(&self) -> Self::Streams {}
/// # }
/// #
/// # impl Widget for Win {
Expand Down

0 comments on commit 1f8e666

Please sign in to comment.