Repository navigation
fix: Make the ShibokenHelpers.cmake patch safe to re-run - #1434
Merged
cedrik-fuoco-adsk merged 1 commit intoOct 2, 2026
Conversation
make_pyside6.py raised "expected compiler-id block was not found" when the PySide6 source tree was already patched, which happens when CI restores _build/_deps from its dependency cache. It also renamed the file to .old before checking, so a failed match left ShibokenHelpers.cmake missing for every later run. Skip the patch when the Clang -Wno-cast-function-type-mismatch line is already present, and only rename the file once the replacement is known to apply. Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
cedrik-fuoco-adsk
marked this pull request as ready for review
September 30, 2026 20:03
cedrik-fuoco-adsk
requested review from
bernie-laberge and
eloisebrosseau
as code owners
September 30, 2026 20:03
eloisebrosseau
approved these changes
Oct 2, 2026
cedrik-fuoco-adsk
merged commit Oct 2, 2026
838bf2e
into
AcademySoftwareFoundation:main
20 checks passed
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.
fix: Make the ShibokenHelpers.cmake patch safe to re-run
Linked issues
None. Found on the macOS CI job of #1427 (run 36735866190).
Summarize your change.
make_pyside6.pynow skips theShibokenHelpers.cmakeClang warning patch when the source tree is already patched, and only renames the file to.oldonce the replacement is known to apply.Describe the reason for the change.
CI restores
_build/_depsfrom the dependency cache. That cache can hold a PySide6 source tree that an earlier run already patched. The patch step only matched the unpatched block, so it raised:It also renamed
ShibokenHelpers.cmaketo.oldbefore checking, so a failed match left the file missing and broke every later run on the same tree.Describe what you have tested and on which operating system.
macOS: ran the patch logic against a temporary source tree:
.oldbackup writtenRuntimeError,ShibokenHelpers.cmakeleft in placeAdd a list of changes, and note any that might need special attention during the review.
src/build/make_pyside6.py: read the file in place, return early if-Wno-cast-function-type-mismatchis already present, and rename to.oldonly after the replacement succeeds. The patch is the last step ofprepare(), so the early return skips nothing else.