boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 95c6131b by Nicolas Vigier at 2026-09-17T16:45:52+02:00 Bug 41877: Check windows-app-sdk in list_toolchain_updates - - - - - 2 changed files: - projects/windows-app-sdk/config - tools/toolchain-updates/extract-firefox-versions-infos Changes: ===================================== projects/windows-app-sdk/config ===================================== @@ -3,6 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("co version: '2.2.0' var: + windowsappsdk_url: https://aka.ms/windowsappsdk/2.2/2.2.0/Microsoft.WindowsAppRuntime.Redist.2.... windowsappsdk_sha256sum: ab078d5b1d730f093ed4e1a33d0e709d1dbca85fa4a10f546cc6824e3b48057f short_version: 2 @@ -16,5 +17,5 @@ targets: input_files: - name: windowsappsdk-redist - URL: https://aka.ms/windowsappsdk/2.2/2.2.0/Microsoft.WindowsAppRuntime.Redist.2.... + URL: '[% c("var/windowsappsdk_url") %]' sha256sum: '[% c("var/windowsappsdk_sha256sum") %]' ===================================== tools/toolchain-updates/extract-firefox-versions-infos ===================================== @@ -282,16 +282,12 @@ sub get_toolchains_fetch_info { 'wasi-sysroot' => 'wasi-sdk', 'mingw-w64-clang' => 'mingw-w64', ); - # projects which have an different rbm option than git_hash - my %rbm_option = ( - 'windows-app-sdk' => 'var/windowsappsdk_sha256sum', - ); my $d = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml'); foreach my $name (@projects) { set_rbm_info($name, { project => $name, - option => ($rbm_option{$name} ? $rbm_option{$name} : 'git_hash'), + option => 'git_hash', }); my $toolchain_name = $toolchain_names{$name} ? $toolchain_names{$name} : $name; my $revision = $d->{$toolchain_name}{fetch}{revision}; @@ -323,6 +319,33 @@ sub get_toolchains_fetch_info { } else { set_error('windows-rs-sha256sum'); } + + my %winappsdk_rbm_opt = ( + sha256sum => "var/windowsappsdk_sha256sum", + url => "var/windowsappsdk_url", + version => "version", + short_version => "var/short_version", + ); + my %winappsdk_vals = ( + sha256sum => $d->{'windowsappsdk-redist'}{fetch}{sha256}, + url => $d->{'windowsappsdk-redist'}{fetch}{url}, + ); + ($winappsdk_vals{version}) = + $winappsdk_vals{url} =~ m|windowsappsdk/[^/]+/([^/]+)/Microsoft\.WindowsAppRuntime\.Redist|; + my $toolchain_misc = YAML::XS::LoadFile('taskcluster/kinds/toolchain/misc.yml'); + (undef, $winappsdk_vals{short_version}) = + @{$toolchain_misc->{'win64-WindowsAppSDK'}{run}{arguments}}; + foreach my $name (sort keys %winappsdk_rbm_opt) { + set_rbm_info("windows-app-sdk-$name", { + project => 'windows-app-sdk', + option => $winappsdk_rbm_opt{$name}, + }); + if ($winappsdk_vals{$name}) { + set_version_info("windows-app-sdk-$name", $winappsdk_vals{$name}); + } else { + set_error("windows-app-sdk-$name"); + } + } } ## Extract infos from python/mozboot/mozboot/android.py View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/95... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/95... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help