[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41877: Check windows-app-sdk in list_toolchain_updates

Title: GitLab

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:

Changes:

  • projects/windows-app-sdk/config
    ... ... @@ -3,6 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("co
    3 3 
     version: '2.2.0'
    4 4
    5 5 
     var:
    6 
    +  windowsappsdk_url: https://aka.ms/windowsappsdk/2.2/2.2.0/Microsoft.WindowsAppRuntime.Redist.2.2.zip
    6 7 
       windowsappsdk_sha256sum: ab078d5b1d730f093ed4e1a33d0e709d1dbca85fa4a10f546cc6824e3b48057f
    7 8 
       short_version: 2
    8 9
    ... ... @@ -16,5 +17,5 @@ targets:
    16 17
    17 18 
     input_files:
    18 19 
       - name: windowsappsdk-redist
    19 
    -    URL: https://aka.ms/windowsappsdk/2.2/2.2.0/Microsoft.WindowsAppRuntime.Redist.2.2.zip
    20 
    +    URL: '[% c("var/windowsappsdk_url") %]'
    20 21 
         sha256sum: '[% c("var/windowsappsdk_sha256sum") %]'

  • tools/toolchain-updates/extract-firefox-versions-infos
    ... ... @@ -282,16 +282,12 @@ sub get_toolchains_fetch_info {
    282 282 
         'wasi-sysroot'    => 'wasi-sdk',
    283 283 
         'mingw-w64-clang' => 'mingw-w64',
    284 284 
       );
    285 
    -  # projects which have an different rbm option than git_hash
    286 
    -  my %rbm_option = (
    287 
    -    'windows-app-sdk' => 'var/windowsappsdk_sha256sum',
    288 
    -  );
    289 285 
       my $d = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml');
    290 286 
       foreach my $name (@projects) {
    291 287 
         set_rbm_info($name,
    292 288 
           {
    293 289 
             project => $name,
    294 
    -        option  => ($rbm_option{$name} ? $rbm_option{$name} : 'git_hash'),
    290 
    +        option  => 'git_hash',
    295 291 
           });
    296 292 
         my $toolchain_name = $toolchain_names{$name} ? $toolchain_names{$name} : $name;
    297 293 
         my $revision = $d->{$toolchain_name}{fetch}{revision};
    ... ... @@ -323,6 +319,33 @@ sub get_toolchains_fetch_info {
    323 319 
       } else {
    324 320 
         set_error('windows-rs-sha256sum');
    325 321 
       }
    322 
    +
    323 
    +  my %winappsdk_rbm_opt = (
    324 
    +    sha256sum       => "var/windowsappsdk_sha256sum",
    325 
    +    url             => "var/windowsappsdk_url",
    326 
    +    version         => "version",
    327 
    +    short_version   => "var/short_version",
    328 
    +  );
    329 
    +  my %winappsdk_vals = (
    330 
    +    sha256sum => $d->{'windowsappsdk-redist'}{fetch}{sha256},
    331 
    +    url       => $d->{'windowsappsdk-redist'}{fetch}{url},
    332 
    +  );
    333 
    +  ($winappsdk_vals{version}) =
    334 
    +        $winappsdk_vals{url} =~ m|windowsappsdk/[^/]+/([^/]+)/Microsoft\.WindowsAppRuntime\.Redist|;
    335 
    +  my $toolchain_misc = YAML::XS::LoadFile('taskcluster/kinds/toolchain/misc.yml');
    336 
    +  (undef, $winappsdk_vals{short_version}) =
    337 
    +        @{$toolchain_misc->{'win64-WindowsAppSDK'}{run}{arguments}};
    338 
    +  foreach my $name (sort keys %winappsdk_rbm_opt) {
    339 
    +    set_rbm_info("windows-app-sdk-$name", {
    340 
    +        project => 'windows-app-sdk',
    341 
    +        option  => $winappsdk_rbm_opt{$name},
    342 
    +      });
    343 
    +    if ($winappsdk_vals{$name}) {
    344 
    +      set_version_info("windows-app-sdk-$name", $winappsdk_vals{$name});
    345 
    +    } else {
    346 
    +      set_error("windows-app-sdk-$name");
    347 
    +    }
    348 
    +  }
    326 349 
     }
    327 350
    328 351 
     ## Extract infos from python/mozboot/mozboot/android.py

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/95c6131beb2f17c7afb81245a6a96b6d5d8f3af0 at 1789656397 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx