Fix for arch specific subrepos using the wrong parent configs.#3403
Open
cemeceme wants to merge 3 commits intothought-machine:masterfrom
Open
Fix for arch specific subrepos using the wrong parent configs.#3403cemeceme wants to merge 3 commits intothought-machine:masterfrom
cemeceme wants to merge 3 commits intothought-machine:masterfrom
Conversation
Contributor
|
Thanks for the PR - this looks sensible to me, but is it possible to write an e2e test to prevent future regressions? |
This took me too long to notice, but also lead me to find that parsing errors get swallowed for subrepo configs.
Contributor
|
Ok, https://app.circleci.com/pipelines/github/thought-machine/please/7432/workflows/3003c505-2385-4f8a-a217-a7b98d7ed37b passed on CircleCI but hasn't updated here |
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.
Fixes #3346
The
forArchfunction would not take into account that itsparentStates are actually the correct architecture as well. Therefore, it could occur that aparentStatefor the wrong architecture would be used, depending on the order things were parsed. This meant it could use the wrong settings from the parent config files, by not using the correct architecture overrides.This fix simply makes sure that the
parentStateis of the same architecture as requested for the subrepo, and to create it if it didn't exist.