fix generate_combinations issue with Linux Qt 6.7 #756
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
Qt 6.7.0 changes the default arch for Linux from gcc_64 to linux_gcc_64. This allows the generate_combinations.py script to account for that. Also, Qt 6.7.0 is missing a few architectures that were present in earlier versions of Qt6. This makes sure that the script can pick those up.
|
Shouldn't CI for this PR actually run the generate_combinations.py script, or did we not set it up to do that? |
New version of black formats metadata.py differently than before
ddalcino
commented
Feb 10, 2024
| @@ -42,7 +42,7 @@ def iter_arches() -> Generator[dict, None, None]: | |||
| logger.info("Fetching arches") | |||
| archive_ids = list(iter_archive_ids(category="qt")) | |||
| for archive_id in tqdm(archive_ids): | |||
| for version in ("latest", "5.15.2", "5.13.2", "5.9.9"): | |||
| for version in ("latest", "6.5", "6.2", "5.15.2", "5.13.2", "5.9.9"): | |||
There was a problem hiding this comment.
Oops; this doesn't actually work because 6.5 and 6.2 are not valid versions. I was counting on CI to fail if the script doesn't work; I didn't realize it wasn't going to run.
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.
Fix issues discovered in #751. See #751 (comment)
Qt 6.7.0 changes the default arch for Linux from gcc_64 to linux_gcc_64. This allows the generate_combinations.py script to account for that.
Also, Qt 6.7.0 is missing a few architectures that were present in earlier versions of Qt6. This makes sure that the script can pick those up.