Fix order of operations for macOS template check #84990
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
akien-mga
added
the
cherrypick:4.2
brno32
force-pushed
the
macos-templates-fix
branch
from
cb92d5e
to
8f2b701
Compare
akien-mga
approved these changes
Nov 27, 2023
akien-mga
changed the title
|
Thanks! |
|
Cherry-picked for 4.2.1. |
YuriSizov
removed
the
cherrypick:4.2
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.
Potentially resolves #62873.
I'm not a mac user myself, but looks like the order of operations was just wrong. If one of the custom template configs was missing, it'd force a check for the official templates, and if not present, lead to
valid = false. In the issue, the workaround of specifying both custom template configs ensured the check for the official templates wouldn't happen.Looking at all the other platforms, they check for the official templates first, then the custom templates. Made it consistent here