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 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 diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 2456df835f..56158008c9 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -11,8 +11,9 @@ 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] $AsioSDKName = "ASIO-SDK_2.3.4_2025-10-15", + [string] $AsioSDKName = "ASIOSDK", + [string] $AsioSDKUrl = "https://download.steinberg.net/sdk_downloads/ASIO-SDK_2.3.4_2025-10-15.zip", [string] $NsisName = "nsis-3.11", [string] $NsisUrl = "https://downloads.sourceforge.net/project/nsis/NSIS%203/3.11/nsis-3.11.zip", [string] $BuildOption = "" @@ -168,8 +169,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 } }