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

Build: Fix windows for qt6.8.1 #3451

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Build: Fix windows for qt6.8.1 #3451

merged 3 commits into from
Dec 30, 2024

Conversation

pljones
Copy link
Collaborator

@pljones pljones commented Dec 28, 2024

Short description of changes

See #3407 for discussion.

This includes the ci bump commit on the branch, currently.

CHANGELOG: SKIP

Context: Fixes an issue?

See #3407 for discussion.

Leaves the iOS build broken. There doesn't seem to be any way to pin versions in the "Bump versions" workflow.

I've a branch here which reverts the iOS change but the "Bump versions" will just come and bump it again. (Build here.)

Does this change need documentation? What needs to be documented and how?

No

Status of this Pull Request

Fixes the Windows builds.

What is missing until this pull request can be merged?

No.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

AUTOBUILD: Please build all targets

@pljones pljones added the dependencies Pull requests that update a dependency file label Dec 28, 2024
@pljones pljones added this to the Release 3.12.0 milestone Dec 28, 2024
@pljones pljones changed the title Fix windows for qt6.8.1 Build: Fix windows for qt6.8.1 Dec 28, 2024
@ann0see
Copy link
Member

ann0see commented Dec 28, 2024

Leaves the iOS build broken. There doesn't seem to be any way to pin versions in the "Bump versions" workflow.

What if you just update the windows build manually and let #3407 focus only on bumping iOS only? Then we don't have build failures.

@pljones
Copy link
Collaborator Author

pljones commented Dec 28, 2024

Leaves the iOS build broken. There doesn't seem to be any way to pin versions in the "Bump versions" workflow.

What if you just update the windows build manually and let #3407 focus only on bumping iOS only? Then we don't have build failures.

Yup, that's the idea.

@pljones pljones force-pushed the fix-windows-for-qt6_8_1 branch 2 times, most recently from 316144d to 1e56e54 Compare December 29, 2024 10:52
COMPILING.md Outdated Show resolved Hide resolved
@pljones pljones force-pushed the fix-windows-for-qt6_8_1 branch from 1e56e54 to b06b66c Compare December 29, 2024 11:27
@@ -251,7 +251,7 @@ jobs:
- config_name: iOS (artifacts)
target_os: ios
building_on_os: macos-14
base_command: QT_VERSION=6.7.3 ./.github/autobuild/ios.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would still prefer that the Qt upgrade for iOS remains untouched in this PR.

@pljones pljones force-pushed the fix-windows-for-qt6_8_1 branch from b06b66c to 168acb5 Compare December 29, 2024 12:59
@pljones pljones force-pushed the fix-windows-for-qt6_8_1 branch from 168acb5 to f113ef1 Compare December 29, 2024 13:00
@pljones pljones merged commit fe88e3e into main Dec 30, 2024
12 checks passed
@pljones pljones deleted the fix-windows-for-qt6_8_1 branch December 30, 2024 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants