enable cargo workspace and path dependencies to work seamlessly #684

Emilgardis · 2022-04-06T20:36:35Z

This will allow cargo workspaces to work seamlessly with cross, assuming they don't reference anything outside the current workspace root. This change also automatically mounts (if needed) path dependencies.

If they do reference things outside the workspace root, and that fact is not know to cargo metadata (e.g, it's not a workspace member or a path dependency), you'll have to mount it with

[build.env]
volumes = ["THING"]

and set $THING="/path/to/thing" (we need to work on accessibility for this feature too, a lot of reported issues are solved by it)

I'm sure there is an issue directly related to workspaces, but I can't find any.

fixes #388

Emilgardis

https://github.com/cross-rs/cross/tree/14965587d7f9dccac34598495fcd3291c067deba#caveats should be updated

Emilgardis · 2022-04-07T12:43:28Z

We can also use workspace_members and mount members as volumes if they are not on the same "root" folder.

we can also walk through all non-workspace packages, and if source is path+file://, mount that as well.

This will effectively make path dependencies zero-cost, as long as those paths are defined and shown with cargo metadata

Emilgardis · 2022-04-07T12:46:10Z

this is possibly an argument for using cargo as a library, but that locks us to the features of the specific cargo version that is used.

Emilgardis · 2022-04-07T14:16:46Z

I've created https://github.com/cross-rs/test-workspace to test against

src/docker.rs

Emilgardis · 2022-04-07T17:57:05Z

bors try --target x86_64-unknown-linux-gnu

bors · 2022-04-07T18:07:15Z

try

Build succeeded:

conclusion

CHANGELOG.md

Emilgardis · 2022-04-07T18:04:32Z

README.md

+  However, you may use Cargo's `--manifest-path` option to reference your
+  target crate, executed from a common root directory from which all your
+  dependencies are available.


ci/test.sh

Emilgardis · 2022-04-07T18:05:42Z

src/cargo.rs

+        // TODO: Also filter out things that are in workspace, but not a workspace member
+        self.non_workspace_members().filter_map(|p| p.crate_path())
+    }


this todo is not super important, but probably good to have since it minifies the mounts needed

src/cargo.rs

src/docker.rs

Emilgardis · 2022-04-07T18:15:58Z

it works! https://github.com/cross-rs/cross/runs/5873527788?check_suite_focus=true#step:7:1482

If anyone is able to review this before it's actually ready, please do <3

Emilgardis · 2022-04-07T18:16:47Z

ping @wngr

this integrates #494

src/main.rs

Emilgardis · 2022-04-07T19:11:50Z

bors try

bors · 2022-04-07T19:27:51Z

try

Build succeeded:

conclusion

src/cargo.rs

Emilgardis · 2022-06-03T16:52:31Z

bors try --target *unknown-linux-gnu

bors · 2022-06-03T17:09:18Z

try

Build succeeded:

conclusion

Outdated, needs new tests.

ci/test.sh

Ensure we build the entire workspace using the `--workspace` flag both with and without the manifest path, and also ensure we build the binary with all our workspace dependencies.

Alexhuszagh

Everything looks great and the updated tests all pass. I believe this is ready to merge. Should I r+ it?

Alexhuszagh · 2022-06-07T19:24:25Z

bors r+

684: enable cargo workspace and path dependencies to work seamlessly r=Alexhuszagh a=Emilgardis This will allow cargo workspaces to work seamlessly with cross, assuming they don't reference anything outside the current workspace root. This change also automatically mounts (if needed) path dependencies. If they do reference things outside the workspace root, and that fact is not know to `cargo metadata` (e.g, it's not a workspace member or a path dependency), you'll have to mount it with ```toml [build.env] volumes = ["THING"] ``` and set `$THING="/path/to/thing"` (we need to work on accessibility for this feature too, a lot of reported issues are solved by it) I'm sure there is an issue directly related to workspaces, but I can't find any. fixes #388 Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com> Co-authored-by: wngr <oliver@wngr.de> Co-authored-by: Alexander Huszagh <ahuszagh@gmail.com>

bors · 2022-06-07T20:06:28Z

Build failed:

conclusion

`"${@}"` is an unbound variable on Bash 3.2, while `"$@"` is not, and Bash 3.2 is the pre-installed version on macOS.

Alexhuszagh · 2022-06-07T20:36:20Z

bors try --target x86_64-apple-darwin

bors · 2022-06-07T20:49:37Z

try

Build succeeded:

conclusion

Alexhuszagh · 2022-06-07T20:51:29Z

bors r+

bors · 2022-06-07T21:17:34Z

Build succeeded:

conclusion

Emilgardis commented Apr 6, 2022

View reviewed changes

Emilgardis mentioned this pull request Apr 7, 2022

feat: Parse Cargo's --manifest-path option to determine mounted docker root #494

Closed

Emilgardis commented Apr 7, 2022

View reviewed changes

src/docker.rs Outdated Show resolved Hide resolved

Emilgardis force-pushed the cargo-workspace branch 2 times, most recently from 2efc53b to 7860d47 Compare April 7, 2022 17:54

bors bot added a commit that referenced this pull request Apr 7, 2022

Try #684: --target x86_64-unknown-linux-gnu

07178ce

Emilgardis commented Apr 7, 2022

View reviewed changes

src/main.rs Outdated Show resolved Hide resolved

bors bot added a commit that referenced this pull request Apr 7, 2022

Try #684:

9395c15

Emilgardis commented Apr 8, 2022

View reviewed changes

src/cargo.rs Show resolved Hide resolved

Emilgardis force-pushed the cargo-workspace branch from 7860d47 to b1577ce Compare April 29, 2022 16:18

Emilgardis marked this pull request as ready for review April 29, 2022 16:18

Emilgardis requested a review from a team as a code owner April 29, 2022 16:18

Emilgardis mentioned this pull request Apr 29, 2022

Building with local dependencies #388

Closed

Emilgardis changed the title ~~enable cargo workspaces to work seamlessly~~ enable cargo workspaces and local dependencies to work seamlessly May 8, 2022

Emilgardis changed the title ~~enable cargo workspaces and local dependencies to work seamlessly~~ enable cargo workspace and path dependencies to work seamlessly May 8, 2022

Emilgardis linked an issue May 20, 2022 that may be closed by this pull request

--manifest-path not working #640

Closed

Emilgardis mentioned this pull request May 20, 2022

--manifest-path not working #640

Closed

Emilgardis force-pushed the cargo-workspace branch 3 times, most recently from b777258 to 4bc0b65 Compare May 26, 2022 10:33

Emilgardis force-pushed the cargo-workspace branch from 8648779 to 4232a2a Compare June 3, 2022 16:52

bors bot added a commit that referenced this pull request Jun 3, 2022

Try #684: --target *unknown-linux-gnu

a036151

Emilgardis requested a review from a team June 7, 2022 02:49

Alexhuszagh self-requested a review June 7, 2022 05:22

Alexhuszagh self-assigned this Jun 7, 2022

Alexhuszagh reviewed Jun 7, 2022

View reviewed changes

ci/test.sh Show resolved Hide resolved

Update workspace tests

12b4727

Ensure we build the entire workspace using the `--workspace` flag both with and without the manifest path, and also ensure we build the binary with all our workspace dependencies.

Alexhuszagh approved these changes Jun 7, 2022

View reviewed changes

Fix unbounded variable error on Bash 3.2

3e59d85

`"${@}"` is an unbound variable on Bash 3.2, while `"$@"` is not, and Bash 3.2 is the pre-installed version on macOS.

bors bot added a commit that referenced this pull request Jun 7, 2022

Try #684: --target x86_64-apple-darwin

e9fdc75

bors bot merged commit 0c1d76d into cross-rs:main Jun 7, 2022

Emilgardis deleted the cargo-workspace branch June 7, 2022 21:18

This was referenced Jun 10, 2022

Feature Request: Private SSH Dependencies #401

Closed

Download ssh deps over http, allow passing in credentials #627

Closed

Emilgardis added this to the v0.2.2 milestone Jun 15, 2022

Emilgardis mentioned this pull request Jul 1, 2022

Problem with 0.2.2 and CROSS_DOCKER_IN_DOCKER #893

Closed

11 tasks

Alexhuszagh mentioned this pull request Jul 2, 2022

Running cross with --metadata-path=directory/Cargo.toml will fail to work #334

Closed

This was referenced Nov 6, 2022

Supporting relative path in Cargo.toml depends #277

Closed

Dependencies referenced by path. #139

Closed

Emilgardis mentioned this pull request Apr 4, 2024

Missing manifest file issue #1469

Closed

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

enable cargo workspace and path dependencies to work seamlessly #684

enable cargo workspace and path dependencies to work seamlessly #684

Emilgardis commented Apr 6, 2022 •

edited

Loading

Emilgardis left a comment

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

bors bot commented Apr 7, 2022

Emilgardis Apr 7, 2022

Emilgardis Apr 7, 2022

Emilgardis commented Apr 7, 2022 •

edited

Loading

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

bors bot commented Apr 7, 2022

Emilgardis commented Jun 3, 2022

bors bot commented Jun 3, 2022

Alexhuszagh left a comment

Alexhuszagh commented Jun 7, 2022

bors bot commented Jun 7, 2022

Alexhuszagh commented Jun 7, 2022

bors bot commented Jun 7, 2022

Alexhuszagh commented Jun 7, 2022

bors bot commented Jun 7, 2022

enable cargo workspace and path dependencies to work seamlessly #684

enable cargo workspace and path dependencies to work seamlessly #684

Conversation

Emilgardis commented Apr 6, 2022 • edited Loading

Emilgardis left a comment

Choose a reason for hiding this comment

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

bors bot commented Apr 7, 2022

try

Emilgardis Apr 7, 2022

Choose a reason for hiding this comment

Emilgardis Apr 7, 2022

Choose a reason for hiding this comment

Emilgardis commented Apr 7, 2022 • edited Loading

Emilgardis commented Apr 7, 2022

Emilgardis commented Apr 7, 2022

bors bot commented Apr 7, 2022

try

Emilgardis commented Jun 3, 2022

bors bot commented Jun 3, 2022

try

Alexhuszagh left a comment

Choose a reason for hiding this comment

Alexhuszagh commented Jun 7, 2022

bors bot commented Jun 7, 2022

Alexhuszagh commented Jun 7, 2022

bors bot commented Jun 7, 2022

try

Alexhuszagh commented Jun 7, 2022

bors bot commented Jun 7, 2022

Emilgardis commented Apr 6, 2022 •

edited

Loading

Emilgardis commented Apr 7, 2022 •

edited

Loading