Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily add clang dependency to natron-build-deps-qt5 package. #935

Merged

Conversation

acolwell
Copy link
Collaborator

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?

Updates the natron-build-deps-qt5 MinGW package to have a dependency on the clang package. This is needed because a recent change to the MSYS shiboken2 package (msys2/MINGW-packages@c210274) broke the Windows Natron build. I believe the underlying issue stems from the MSYS shiboken2 not being able to find g++ because it tries to look for it in a hard-coded path that is only valid when that package was built. Unfortunately fixing that issue might not be straight forward, so for now I'm adding back the dependency on clang so that Natron is at least able to build again on Windows.

Have you tested your changes (if applicable)? If so, how?

Yes. I've rebuilt the natron-build-deps-qt5 package locally and used it to build Natron. I've also verified that "Build pacman repo" action is able to build the package as well (https://github.com/acolwell/Natron/actions/runs/7341376846).

Futher details of this pull request

The Windows installer and Test build actions will not start working again until the "Natron MinGW pacman repository" release (https://github.com/NatronGitHub/Natron/releases/tag/windows-mingw-package-repo) is updated with the new packages. My plan is to land this change and then update the release with a new zip file generated from the "Build pacman repo" action. Once that is done, the Windows installer and Test actions should start working again.

@devernay
Copy link
Member

@acolwell feel free to merge when you think it's ok

@acolwell
Copy link
Collaborator Author

@acolwell feel free to merge when you think it's ok

@devernay I think it should be ok now that the "Build pacman repo" action passed. Unfortunately I can't merge without an approval from someone with write access.

@devernay devernay self-requested a review December 28, 2023 06:06
@devernay devernay merged commit 30c14fd into NatronGitHub:RB-2.5 Dec 28, 2023
3 of 4 checks passed
@devernay
Copy link
Member

Done

@acolwell acolwell deleted the add-clang-deps-to-natron-build-deps-qt5 branch December 28, 2023 17:13
@acolwell
Copy link
Collaborator Author

Thank you. The Natron MINGW pacman repository release (https://github.com/NatronGitHub/Natron/releases/tag/windows-mingw-package-repo) was updated with the zip file generated by (https://github.com/NatronGitHub/Natron/actions/runs/7344966827). I reran the "Build Installer" and "Tests" workflows to verify that the Windows build has been restored. The installer built fine, but I discovered that the "Tests" workflow was not using the Natron pacman repo for its deps, so it failed . I created #936 to resolve this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants