From 045b9c1993458cc18d7e7e3595add5c58f3c1155 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Wed, 28 Jan 2026 16:51:31 +0000 Subject: [PATCH 1/3] 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 | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 2456df835f..61f382c015 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -11,9 +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] $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 = "" ) @@ -128,8 +126,6 @@ Function Install-Dependency [Parameter(Mandatory=$true)] [string] $Uri, [Parameter(Mandatory=$true)] - [string] $Name, - [Parameter(Mandatory=$true)] [string] $Destination ) @@ -140,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") { @@ -151,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 } @@ -162,14 +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. - Install-Dependency -Uri $AsioSDKUrl ` - -Name $AsioSDKName -Destination "..\libs\ASIOSDK2" + Install-Dependency -Uri $AsioSDKUrl -Destination "..\libs\ASIOSDK2" } } From c4a2f93ea0c74554d1529c7cb6bce22dad12e956 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Thu, 30 Oct 2025 11:11:20 +0000 Subject: [PATCH 2/3] 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 9a2cfdc07d..a2f45fab30 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@v6 From 39fb178c2447ffd80ec307760a30b5f39d980b2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 30 Jan 2026 20:57:28 +0000 Subject: [PATCH 3/3] Build: Bump Qt6 from 6.10.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 c98fda9fa7..082c644fca 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.10.1" +$Qt64Version = "6.10.2" $AqtinstallVersion = "3.3.0" $JackVersion = "1.9.22" $Msvc32Version = "win32_msvc2019" diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 0457d6ae31..dcb2415c25 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-15 - base_command: QT_VERSION=6.10.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 xcode_version: 16.3.0 @@ -249,7 +249,7 @@ jobs: - config_name: iOS (artifacts) target_os: ios building_on_os: macos-15 - 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: