use source toolchain version when passing only --try-toolchain#4395
Merged
ocaisa merged 2 commits intoeasybuilders:developfrom Dec 5, 2023
Merged
use source toolchain version when passing only --try-toolchain#4395ocaisa merged 2 commits intoeasybuilders:developfrom
--try-toolchain#4395ocaisa merged 2 commits intoeasybuilders:developfrom
Conversation
13781ff to
f16d111
Compare
`process_software_build_specs` ialways adds a `toolchain` key even when only the name of the toolchain is available. This makes the code in `tweak` ignore the code path in using `toolchain_name` and/or `toolchain_version` with the fallback to using the values of the source toolchain. This in turn leads to failures further down when a value of `None` is used where an actual version is expected. Fix by only adding the `toolchain` key when we have both the name and version and hence a complete, valid toolchain spec.
f16d111 to
9613d9f
Compare
Member
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
process_software_build_specsalways adds atoolchainkey even when only the name of the toolchain is available. This makes the code intweakignore the code path in usingtoolchain_nameand/ortoolchain_versionwith the fallback to using the values of the source toolchain.This in turn leads to failures further down when a value of
Noneis used where an actual version is expected.Fix by only adding the
toolchainkey when we have both the name and version and hence a complete, valid toolchain spec.CC @boegel who added the code using a default of
Nonefor the version in #810 Maybe you remember the reasoning?