Rust: refactor workspaces. #4997
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jdisanti
approved these changes
Jun 26, 2023
jdisanti
approved these changes
Jun 26, 2023
4 tasks
DavidSouther
force-pushed
the
rust/refactor/workspaces
branch
from
1b363cf to
10d4f1b
Compare
lkdavies
added
status/text-review-complete
and removed
status/text-review-needed
labels
DavidSouther
force-pushed
the
rust/refactor/workspaces
branch
from
10d4f1b to
697c5a3
Compare
The project has a single main workspace, but this doesn't work for wasm or for lambda runtime. Rather than have those as one-offs, this refactor moves the cross-service, applications, and "other" pieces to dedicated top-level workspaces. Closes awsdocs#4996
DavidSouther
force-pushed
the
rust/refactor/workspaces
branch
from
b25e7f1 to
011243b
Compare
rlhagerm
reviewed
Jun 30, 2023
rlhagerm
approved these changes
Jun 30, 2023
github-merge-queue bot
pushed a commit
to smithy-lang/smithy-rs
that referenced
this pull request
Jun 30, 2023
## Motivation and Context When the WebAssembly SDK example was added some months ago, we changed the build process to make each SDK example its own Cargo workspace. This allowed the `.cargo/config.toml` that changed the compiler target to work correctly. However, this has led to other issues: dependency compilation is no longer shared between examples which greatly increases the time it takes for that CI step to run, and now it is even running out of disk space on the GitHub Actions runners. This PR adds support for a new workspace layout where the [`aws-doc-sdk-examples`](https://github.com/awsdocs/aws-doc-sdk-examples) repo gets to decide how the workspaces are logically grouped. If a `Cargo.toml` file exists at the example root, then the build system assumes that the _old_ "one example, one workspace" layout should be used. If there is no root `Cargo.toml`, then it assumes the new layout should be used. The `sdk-versioner` tool had to be adapted to support more complex relative path resolution to make this work, and the `publisher fix-manifests` subcommand had to be fixed to ignore workspace-only `Cargo.toml` files. The build system in this PR needs to work for both the old and new examples layout so that the `sdk-sync` process will succeed. #2810 has been filed to track removing the old example layout at a later date. [aws-doc-sdk-examples#4997](awsdocs/aws-doc-sdk-examples#4997) changes the workspace structure of the actual examples to the new one. ## Testing - [x] Generated a full SDK with the old example layout, manually examined the output, and spot checked that some examples compile - [x] Generated a full SDK with the new example layout, manually examined the output, and spot checked that some examples compile - [x] Examples pass in CI with the old example layout - [x] Examples pass in CI with the new example layout ---- _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The project has a single main workspace, but this doesn't work for wasm or for lambda runtime. Rather than have those as one-offs, this refactor moves the cross-service, applications, and "other" pieces to dedicated top-level workspaces.
Closes #4996
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.