From 4424bd743d5b54eabea520b5580eb637a11ee575 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Thu, 30 Oct 2025 11:11:20 +0000 Subject: [PATCH 1/6] Allow new ASIO filename format Make asiosdk or ASIO-SDK part of the version, so that URLs are correct. --- .github/workflows/bump-dependencies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-dependencies.yml b/.github/workflows/bump-dependencies.yml index 017257ce56..860302b352 100644 --- a/.github/workflows/bump-dependencies.yml +++ b/.github/workflows/bump-dependencies.yml @@ -79,8 +79,8 @@ jobs: changelog_name: ASIO SDK (Windows-only) get_upstream_version: | curl -s -o /dev/null --location --range 0-5 --write-out '%{url_effective}' https://www.steinberg.net/asiosdk | - grep -oP '.*asiosdk_\K.*(?=\.zip)' - local_version_regex: (.*["\/]asiosdk_)([^"]+?)(".*|\.zip.*) + grep -oP '.*\K(?:ASIO-SDK|asiosdk)_.*(?=\.zip)' + local_version_regex: (.*["\/])((?:ASIO-SDK|asiosdk)_[^"]+?)(".*|\.zip.*) steps: - uses: actions/checkout@v4 From 72e87bd560eb78322892843b505248f473e96b31 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Thu, 30 Oct 2025 17:12:49 +0000 Subject: [PATCH 2/6] Add windows debugging --- windows/deploy_windows.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 2456df835f..1cd1f371e5 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -168,8 +168,10 @@ Function Install-Dependencies if ($BuildOption -Notmatch "jack") { # Don't download ASIO SDK on Jamulus JACK builds to save # resources and to be extra-sure license-wise. + Set-PSDebug -Trace 2 Install-Dependency -Uri $AsioSDKUrl ` -Name $AsioSDKName -Destination "..\libs\ASIOSDK2" + Set-PSDebug -Off } } From c785b238eed6c1e716ba26ff773c8fc7ce087967 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Thu, 30 Oct 2025 17:14:51 +0000 Subject: [PATCH 3/6] Only build Windows while testing --- .github/workflows/autobuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 82d9786a5e..9a6fc67de1 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -198,7 +198,7 @@ jobs: building_on_os: ubuntu-22.04 base_command: ./.github/autobuild/android.sh run_codeql: true - is_main_build_target: true + #is_main_build_target: true # Jamulus.pro needs to count git history length for android versioning: checkout_fetch_depth: '0' @@ -208,7 +208,7 @@ jobs: building_container: ubuntu:20.04 base_command: ./.github/autobuild/linux_deb.sh run_codeql: true - is_main_build_target: true + #is_main_build_target: true - config_name: Linux .deb armhf (artifacts) target_os: linux @@ -232,7 +232,7 @@ jobs: run_codeql: false # Latest Xcode which runs on macos-14: xcode_version: 15.4.0 - is_main_build_target: true + #is_main_build_target: true # Reminder: If Legacy is removed, be sure to add a dedicated job for CodeQL again. - config_name: MacOS Legacy (artifacts+CodeQL) @@ -246,7 +246,7 @@ jobs: # https://developer.apple.com/support/xcode/ # https://xcodereleases.com/ xcode_version: 14.2.0 - is_main_build_target: true + #is_main_build_target: true - config_name: iOS (artifacts) target_os: ios From 30f82ccebd42a69e3ec9d09140ee353a0b6dda96 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Fri, 31 Oct 2025 17:19:21 +0000 Subject: [PATCH 4/6] Test different ASIO name --- windows/deploy_windows.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 1cd1f371e5..8ce8d7ff24 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -11,7 +11,8 @@ param ( # # The following version pinnings are semi-automatically checked for # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: - [string] $AsioSDKName = "asiosdk_2.3.3_2019-06-14", + #[string] $AsioSDKName = "asiosdk_2.3.3_2019-06-14", + [string] $AsioSDKName = "ASIOSDK", [string] $AsioSDKUrl = "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip", [string] $NsisName = "nsis-3.11", [string] $NsisUrl = "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11.zip", From e0ae39876a5d726556e1d3bc47fd657290ee87bb Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Wed, 28 Jan 2026 16:24:58 +0000 Subject: [PATCH 5/6] Improve deploy_windows.ps1 fetching of dependencies Updated Install-Dependency to create a unique empty directory for unpacking the fetched zip file into, for ASIO and NSIS. This avoids having to know the top-level directory name used within the archive, which for ASIO is not consistent between versions. --- windows/deploy_windows.ps1 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 8ce8d7ff24..61f382c015 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -11,10 +11,7 @@ param ( # # The following version pinnings are semi-automatically checked for # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: - #[string] $AsioSDKName = "asiosdk_2.3.3_2019-06-14", - [string] $AsioSDKName = "ASIOSDK", [string] $AsioSDKUrl = "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip", - [string] $NsisName = "nsis-3.11", [string] $NsisUrl = "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11.zip", [string] $BuildOption = "" ) @@ -129,8 +126,6 @@ Function Install-Dependency [Parameter(Mandatory=$true)] [string] $Uri, [Parameter(Mandatory=$true)] - [string] $Name, - [Parameter(Mandatory=$true)] [string] $Destination ) @@ -141,7 +136,11 @@ Function Install-Dependency } $TempFileName = [System.IO.Path]::GetTempFileName() + ".zip" - $TempDir = [System.IO.Path]::GetTempPath() + $TempPath = [System.IO.Path]::GetTempPath() + $TempGuid = [System.Guid]::NewGuid() + # Create a unique empty directory to unpack into + $TempDir = (Join-Path $TempPath $TempGuid) + New-Item -ItemType Directory -Path $TempDir if ($Uri -Match "downloads.sourceforge.net") { @@ -152,7 +151,10 @@ Function Install-Dependency echo $TempFileName Expand-Archive -Path $TempFileName -DestinationPath $TempDir -Force echo $WindowsPath\$Destination - Move-Item -Path "$TempDir\$Name" -Destination "$WindowsPath\$Destination" -Force + # Because we unpacked into a new directory, we can use * for the directory in the archive, + # so that we do not need to know the directory name the archive was packed from. + Move-Item -Path "$TempDir\*" -Destination "$WindowsPath\$Destination" -Force + Remove-Item -Path $TempDir -Recurse -Force Remove-Item -Path $TempFileName -Force } @@ -163,16 +165,12 @@ Function Install-Dependencies Install-PackageProvider -Name "Nuget" -Scope CurrentUser -Force } Initialize-Module-Here -m "VSSetup" - Install-Dependency -Uri $NsisUrl ` - -Name $NsisName -Destination "..\libs\NSIS\NSIS-source" + Install-Dependency -Uri $NsisUrl -Destination "..\libs\NSIS\NSIS-source" if ($BuildOption -Notmatch "jack") { # Don't download ASIO SDK on Jamulus JACK builds to save # resources and to be extra-sure license-wise. - Set-PSDebug -Trace 2 - Install-Dependency -Uri $AsioSDKUrl ` - -Name $AsioSDKName -Destination "..\libs\ASIOSDK2" - Set-PSDebug -Off + Install-Dependency -Uri $AsioSDKUrl -Destination "..\libs\ASIOSDK2" } } From 9ddedf301ef8b8dfed2c3f5fb052c45646e426c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 28 Jan 2026 16:33:26 +0000 Subject: [PATCH 6/6] Build: Bump Qt6 from 6.9.1 to 6.10.2 --- .github/autobuild/windows.ps1 | 2 +- .github/workflows/autobuild.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/autobuild/windows.ps1 b/.github/autobuild/windows.ps1 index 9a0157d796..50ac16412f 100644 --- a/.github/autobuild/windows.ps1 +++ b/.github/autobuild/windows.ps1 @@ -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.9.1" +$Qt64Version = "6.10.2" $AqtinstallVersion = "3.1.21" $JackVersion = "1.9.22" $Msvc32Version = "win32_msvc2019" diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 9a6fc67de1..c34f9fc1e2 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -227,7 +227,7 @@ jobs: - config_name: MacOS (artifacts) target_os: macos building_on_os: macos-14 - base_command: QT_VERSION=6.9.1 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh + base_command: QT_VERSION=6.10.2 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 # Latest Xcode which runs on macos-14: @@ -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.10.2 ./.github/autobuild/ios.sh # 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: