Skip to content

Commit ce1cd17

Browse files
authored
Disable proc-macros crate from being tested due to cargo bug (#3103)
* cargo: remove unused `editor/ron` feature * cargo: add wgpu-executor as a member, sort list * cargo: test every crate by default * cargo: disable testing of `graphite-proc-macros`
1 parent c14e67e commit ce1cd17

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

.github/workflows/build-dev-and-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
109109
- name: 🧪 Run Rust tests
110110
run: |
111-
mold -run cargo test --all-features --workspace
111+
mold -run cargo test --all-features
112112
113113
- name: 📃 Generate code documentation info for website
114114
if: github.ref == 'refs/heads/master'

Cargo.toml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,55 @@
11
[workspace]
22
members = [
3-
"editor",
43
"desktop",
54
"desktop/wrapper",
65
"desktop/embedded-resources",
7-
"proc-macros",
6+
"editor",
87
"frontend/wasm",
8+
"libraries/dyn-any",
9+
"libraries/path-bool",
10+
"libraries/math-parser",
911
"node-graph/gapplication-io",
1012
"node-graph/gbrush",
1113
"node-graph/gcore",
1214
"node-graph/gcore-shaders",
13-
"node-graph/gstd",
1415
"node-graph/gmath-nodes",
1516
"node-graph/gpath-bool",
1617
"node-graph/graph-craft",
1718
"node-graph/graphene-cli",
1819
"node-graph/graster-nodes",
20+
"node-graph/gstd",
1921
"node-graph/gsvg-renderer",
2022
"node-graph/interpreted-executor",
2123
"node-graph/node-macro",
2224
"node-graph/preprocessor",
23-
"libraries/dyn-any",
24-
"libraries/path-bool",
25-
"libraries/math-parser",
25+
"node-graph/wgpu-executor",
26+
"proc-macros",
2627
]
2728
default-members = [
29+
"desktop",
30+
"desktop/wrapper",
2831
"editor",
2932
"frontend/wasm",
33+
"libraries/dyn-any",
34+
"libraries/path-bool",
35+
"libraries/math-parser",
36+
"node-graph/gapplication-io",
3037
"node-graph/gbrush",
3138
"node-graph/gcore",
3239
"node-graph/gcore-shaders",
33-
"node-graph/gstd",
3440
"node-graph/gmath-nodes",
3541
"node-graph/gpath-bool",
3642
"node-graph/graph-craft",
3743
"node-graph/graphene-cli",
3844
"node-graph/graster-nodes",
45+
"node-graph/gstd",
3946
"node-graph/gsvg-renderer",
4047
"node-graph/interpreted-executor",
4148
"node-graph/node-macro",
49+
"node-graph/preprocessor",
50+
"node-graph/wgpu-executor",
51+
# blocked by https://github.com/rust-lang/cargo/issues/15890
52+
# "proc-macros",
4253
]
4354
resolver = "2"
4455

desktop/wrapper/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ gpu = ["graphite-editor/gpu"]
1616
# Local dependencies
1717
graphite-editor = { path = "../../editor", features = [
1818
"gpu",
19-
"ron",
2019
"vello",
2120
] }
2221
graphene-std = { workspace = true }

editor/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ wasm = ["wasm-bindgen", "graphene-std/wasm"]
1616
gpu = ["interpreted-executor/gpu", "wgpu-executor"]
1717
resvg = ["graphene-std/resvg"]
1818
vello = ["graphene-std/vello", "resvg"]
19-
ron = []
2019

2120
[dependencies]
2221
# Local dependencies

0 commit comments

Comments
 (0)