Build: Bump aqt from 3.1.21 to 3.3.0 (Automated PR)

.github/autobuild/android.sh

@@ -32,7 +32,7 @@ COMMANDLINETOOLS_VERSION=6858069
 ANDROID_NDK_VERSION=r21d
 ANDROID_PLATFORM=android-30
 ANDROID_BUILD_TOOLS=30.0.2
-AQTINSTALL_VERSION=3.1.21
+AQTINSTALL_VERSION=3.3.0
 QT_VERSION=5.15.2
 
 # Only variables which are really needed by sub-commands are exported.

.github/autobuild/ios.sh

@@ -29,7 +29,7 @@ set -eu
 QT_DIR=/opt/qt
 # The following version pinnings are semi-automatically checked for
 # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually:
-AQTINSTALL_VERSION=3.1.21
+AQTINSTALL_VERSION=3.3.0
 
 if [[ ! ${QT_VERSION:-} =~ [0-9]+\.[0-9]+\..* ]]; then
     echo "Environment variable QT_VERSION must be set to a valid Qt version"

.github/autobuild/mac.sh

@@ -29,7 +29,7 @@ set -eu
 QT_DIR=~/qt
 # The following version pinnings are semi-automatically checked for
 # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually:
-AQTINSTALL_VERSION=3.1.21
+AQTINSTALL_VERSION=3.3.0
 
 TARGET_ARCHS="${TARGET_ARCHS:-}"
 

.github/autobuild/windows.ps1

@@ -50,7 +50,7 @@ $DownloadCacheDir = 'C:\AutobuildCache'
 # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually:
 $Qt32Version = "5.15.2"
 $Qt64Version = "6.9.1"
-$AqtinstallVersion = "3.1.21"
+$AqtinstallVersion = "3.3.0"
 $JackVersion = "1.9.22"
 $Msvc32Version = "win32_msvc2019"
 $Msvc64Version = "win64_msvc2022_64"

.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

.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

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"
     }
 }