Skip to content

Commit fc2fe9b

Browse files
committed
gather crates into workspace
1 parent 9453af7 commit fc2fe9b

File tree

11 files changed

+22
-201
lines changed

11 files changed

+22
-201
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,36 +44,20 @@ jobs:
4444

4545
- name: "relm: tests"
4646
run: |
47-
Xvfb :99 &
48-
sleep 3
49-
openbox &
50-
cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture
47+
cargo test -- --nocapture
5148
5249
- name: "relm-derive: tests"
5350
run: |
5451
cargo test --manifest-path relm-derive/Cargo.toml -- --nocapture
5552
56-
- name: "relm: test examples"
53+
- name: "relm-examples: tests"
5754
run: |
5855
Xvfb :99 &
5956
sleep 3
6057
openbox &
6158
cargo test --manifest-path relm-examples/Cargo.toml --examples
6259
63-
- name: "relm: test buttons-attribute example"
64-
run: |
65-
Xvfb :99 &
66-
sleep 3
67-
openbox &
68-
cargo test --manifest-path relm-examples/examples/buttons-attribute/Cargo.toml
69-
70-
- name: "relm: build http example"
71-
run: cargo build --manifest-path relm-examples/examples/http/Cargo.toml
72-
73-
- name: "relm: build async example"
74-
run: cargo build --manifest-path relm-examples/examples/async/Cargo.toml
75-
76-
- name: "relm: build webkit-test example"
60+
- name: "relm-examples: build webkit-test example"
7761
run: cargo build --manifest-path relm-examples/examples/webkit-test/Cargo.toml
7862

7963
- uses: bcomnes/[email protected]

Cargo.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,17 @@ glib = "^0.10.0"
1818
glib-sys = "^0.10.0"
1919
gobject-sys = "^0.10.0"
2020
gtk = "^0.9.0"
21+
json = "^0.11.5"
2122
libc = "^0.2.54"
2223
log = "^0.4.6"
24+
simplelog = "^0.5.3"
25+
uhttp_uri = "^0.5.1"
26+
27+
[dev-dependencies]
28+
relm-derive = { path = "relm-derive" }
2329

2430
[features]
2531
hidpi = ["cairo-rs/v1_14"]
32+
33+
[workspace]
34+
members = ["relm-derive", "relm-examples", "relm-examples/examples/webkit-test", "relm-test"]

relm-examples/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ edition = "2018"
1010
[dev-dependencies]
1111
chrono = "0.4"
1212
gdk = "^0.13.0"
13+
gdk-pixbuf = "^0.9.0"
1314
glib = "^0.10.0"
1415
gtk = "^0.9.0"
1516
gtk-test = "^0.6"
17+
json = "^0.11.5"
1618
rand = "^0.5.1"
19+
simplelog = "^0.5.3"
20+
uhttp_uri = "^0.5.1"
1721

1822
[dev-dependencies.gio]
1923
version = "^0.9.0"
24+
features = ["v2_50"]
2025

2126
[dev-dependencies.relm]
2227
path = ".."

relm-examples/examples/async/Cargo.toml

Lines changed: 0 additions & 19 deletions
This file was deleted.

relm-examples/examples/buttons-attribute/Cargo.toml

Lines changed: 0 additions & 18 deletions
This file was deleted.

relm-examples/examples/buttons-attribute/src/main.rs

Lines changed: 0 additions & 122 deletions
This file was deleted.

relm-examples/examples/http/Cargo.toml

Lines changed: 0 additions & 22 deletions
This file was deleted.

relm-examples/tests/include.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl Widget for Win {
6464
}
6565

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

7070
fn main() {

0 commit comments

Comments
 (0)