add support for a "build-all" task #357
Merged
Conversation
This file contains 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
This was previously used to force variants to rebuild every time the build was invoked. Now that the dependency tracking is more robust, this can be safely dropped so that images will only be rebuilt when one of their inputs has changed. Signed-off-by: Ben Cressey <bcressey@amazon.com>
When building all variants, `cargo` will start many builds at once, which won't match up with the value in the environment variable. Instead, use CARGO_MANIFEST_DIR to determine which variant is being built. Parse that into its subcomponents at runtime to avoid needing any of the other variant-related environment variables. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Rather than failing the build for an unsupported architecture, emit a warning. Otherwise, building all variants would always fail if any variant definition did not support the requested architecture. Signed-off-by: Ben Cressey <bcressey@amazon.com>
`buildsys` now parses the variant components on its own, and ignores these environment variables. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Previously, this functionality was in a separate binary because the environment variables needed to be set prior to `buildsys` invocation so that `cargo` could track them for change detection purposes. Now that packages can't be conditionally compiled based on the variant, change detection isn't required, so the binary can be removed. Signed-off-by: Ben Cressey <bcressey@amazon.com>
jpculp
approved these changes
Sep 3, 2024
twoliter/embedded/Makefile.toml
Outdated
|
|
||
| # Save built artifacts for each architecture. We don't set this everywhere | ||
| # because we build host tools with cargo as well, like buildsys and pubsys. | ||
| export CARGO_TARGET_DIR=${BUILDSYS_ROOT_DIR}/target/${BUILDSYS_ARCH} |
mgsharm
approved these changes
Sep 6, 2024
cbgbt
approved these changes
Sep 6, 2024
| @@ -894,6 +894,29 @@ ln -snf "${BUILDSYS_VERSION_FULL}" "${OUTPUT_LOGS_DIR}/latest" | |||
| ''' | |||
| ] | |||
|
|
|||
| [tasks.build-all] | |||
| dependencies = ["fetch", "build-sbkeys", "publish-setup", "cargo-metadata"] | |||
There was a problem hiding this comment.
Either this PR or #361 will need to rebase here. I have no problem doing so, and I think you have your approvals first!
twoliter/embedded/Makefile.toml
Outdated
Comment on lines
903
to
904
| # Save built artifacts for each architecture. We don't set this everywhere | ||
| # because we build host tools with cargo as well, like buildsys and pubsys. |
There was a problem hiding this comment.
This comment doesn't seem correct anymore, since we don't build host tools in Makefile.toml. Maybe we can just set CARGO_TARGET_DIR everywhere?
There was a problem hiding this comment.
Maybe we can just set CARGO_TARGET_DIR everywhere?
Maybe, though there could be unexpected interactions with other uses of cargo, like cargo test in the unit tests task.
`buildsys` no longer depends on BUILDSYS_VARIANT, so it's OK to have a task that tells cargo to build everything in the workspace. Since various scripts might depend on the "latest" symlink created by the "build-variant" task, create the same links in the "build-all" task. Signed-off-by: Ben Cressey <bcressey@amazon.com>
bcressey
force-pushed
the
build-all-variants
branch
from
31cd9b1
to
350b5fb
Compare
|
⬆️ force push to update |
cbgbt
approved these changes
Sep 6, 2024
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.
Issue number:
N/A
Description of changes:
This is a follow-up to #282 that removes the last of
buildsys's dependencies onBUILDSYS_VARIANTand friends. That in turn makes it possible to add a "build-all" target toMakefile.toml, which will help speed up CI runs.(Note that there's still no "publish-all" target;
pubsyscontinues to rely onBUILDSYS_VARIANTto know what to publish.)Testing done:
For x86_64:
And for aarch64:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.