Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
2 changes: 1 addition & 1 deletion .github/workflows/autobuild.yml
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

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

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

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 Down