Skip to content

Build: Bump Qt6 from 6.8.1 to 6.9.1 (Automated PR) #3407

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.

Sign up for GitHub

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

Merged
pljones merged 2 commits into from
Aug 9, 2025
Merged

Build: Bump Qt6 from 6.8.1 to 6.9.1 (Automated PR) #3407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb47f4f
Build: Bump Qt6 from 6.8.1 to 6.9.1
actions-user Aug 8, 2025
ecb3bcf
Revert Qt version for iOS
ann0see Aug 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/autobuild/windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $DownloadCacheDir = 'C:\AutobuildCache'
# The following version pinnings are semi-automatically checked for
# updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually:
$Qt32Version = "5.15.2"
$Qt64Version = "6.8.1"
$Qt64Version = "6.9.1"
$AqtinstallVersion = "3.1.21"
$JackVersion = "1.9.22"
$Msvc32Version = "win32_msvc2019"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/autobuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:
- config_name: MacOS (artifacts)
target_os: macos
building_on_os: macos-14
base_command: QT_VERSION=6.8.1 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh
base_command: QT_VERSION=6.9.1 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh
# Disable CodeQL on mac as it interferes with signing the binaries (signing hangs, see #2563 and #2564)
run_codeql: false
Copy link
Collaborator

@pljones pljones Aug 3, 2025

Choose a reason for hiding this comment

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

If we split x86_64 and arm64, could we run CodeQL on the arm64 build? Currently MacOS doesn't get covered except in the legacy build, which is going to get switched off at some point. Given we must have the code right for arm64, it feels like that's the architecture that should get checked?

Copy link
Member

@ann0see ann0see Aug 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

If we have both architectures, we produce universal builds which is way simpler for the user. We have one binary which runs on M series macs and intel macs. I would rather build those for a bit more (Partly also because I don't own an Apple Silicon mac).

Yes, it would be good to have CodeQL on the non legacy build. But note that arm and x86 builds would need to be signed.

Copy link
Collaborator

@pljones pljones Aug 9, 2025

Choose a reason for hiding this comment

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

Spin the CodeQL off into a separate flow from the signed build? If it's working off the same git checkout and uses the same build params (without signing), that'll be good enough. Anyway, separate issue.

# Latest Xcode which runs on macos-14:
Expand All @@ -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
base_command: QT_VERSION=6.9.1 ./.github/autobuild/ios.sh
Copy link
Collaborator

@pljones pljones Aug 3, 2025

Choose a reason for hiding this comment

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

So if we merge this with QT_VERSION here still 6.7.3, will that pin the version or is something else needed?

Copy link
Member

@ann0see ann0see Aug 3, 2025

Choose a reason for hiding this comment

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

If we leave it at 6.7.3 here, iOS will still use 6.7.3

Copy link
Collaborator

@pljones pljones Aug 4, 2025

Choose a reason for hiding this comment

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

I mean will github-actions stop pushing version bumps.

Copy link
Member

@ann0see ann0see Aug 4, 2025

Choose a reason for hiding this comment

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

No. I don't think so- but we could probably change the code to do so.

Copy link
Collaborator

@pljones pljones Aug 5, 2025

Choose a reason for hiding this comment

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

OK, so we need a PR with that in, too, I guess.

# Build failed with CodeQL enabled when last tested 03/2022 (#2490).
# There are no hints that iOS is supposed to be supported by CodeQL.
# Therefore, disable it:
Expand Down
Loading