-
Notifications
You must be signed in to change notification settings - Fork 382
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add additional toolchains maintained by cross-rs. #795
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
Alexhuszagh
force-pushed
the
ext_toolchains
branch
from
June 14, 2022 20:11
60c1c9e
to
e1b4d84
Compare
Alexhuszagh
changed the title
Added additional toolchains maintained by cross-rs.
Add additional toolchains maintained by cross-rs.
Jun 14, 2022
Emilgardis
requested changes
Jun 14, 2022
Alexhuszagh
force-pushed
the
ext_toolchains
branch
2 times, most recently
from
June 14, 2022 22:46
bdce1f0
to
3dd967c
Compare
Emilgardis
reviewed
Jun 14, 2022
Alexhuszagh
force-pushed
the
ext_toolchains
branch
from
June 14, 2022 23:12
3dd967c
to
794399d
Compare
I think that's everything. We now locate the Dockerfiles ahead of time, allowing mixing and matching in the docker root or the cross-toolchain docker root: fn locate_dockerfile(
target: String,
docker_root: &Path,
cross_toolchain_root: &Path,
) -> cross::Result<(String, String)> {
let dockerfile_name = format!("Dockerfile.{target}");
let dockerfile_root = if cross_toolchain_root.join(&dockerfile_name).exists() {
&cross_toolchain_root
} else if docker_root.join(&dockerfile_name).exists() {
&docker_root
} else {
eyre::bail!("unable to find dockerfile for target \"{target}\"");
};
let dockerfile = dockerfile_root.join(dockerfile_name).display().to_string();
Ok((target, dockerfile))
}
...
pub fn build_docker_image(...) -> cross::Result<()> {
....
let targets = targets
.into_iter()
.map(|t| locate_dockerfile(t, &docker_root, &cross_toolchains_root))
.collect::<cross::Result<Vec<_>>>()?;
let mut results = vec![];
for (target, dockerfile) in &targets {
....
}
....
} |
These toolchains are not automatically tested by CI, and must be built manually by the user. However, they are confirmed to build at least once, and are likely to work as-is. Also adds better error handling when it cannot find a suitable Dockerfile for a given target.
Alexhuszagh
force-pushed
the
ext_toolchains
branch
from
June 14, 2022 23:34
794399d
to
243d3d9
Compare
Emilgardis
approved these changes
Jun 14, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bors r+
Build succeeded: |
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.
These toolchains are not automatically tested by CI, and must be built manually by the user. However, they are confirmed to build at least once, and are likely to work as-is.