morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

2 changed files:

Changes:

  • projects/release/update_responses_config.yml
    ... ... @@ -72,12 +72,11 @@ versions:
    72 72
                 minSupportedInstructionSet: SSE2
    
    73 73
             linux-x86_64:
    
    74 74
                 minSupportedInstructionSet: SSE2
    
    75
    -[% IF c("var/torbrowser_legacy_version") -%]
    
    75
    +[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%]
    
    76 76
         [% c("var/torbrowser_legacy_version") %]:
    
    77 77
             mar_channel_id: [% c('var/mar_channel_id') %]
    
    78 78
             platformVersion: [% c('var/torbrowser_legacy_platform_version') %]
    
    79 79
             detailsURL: https://blog.torproject.org/new[% IF c("var/alpha") %]-alpha[% END %]-release-tor-browser-[% c("var/torbrowser_legacy_version") FILTER remove('\.') %]
    
    80
    -        incremental_from: []
    
    81 80
             # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) )
    
    82 81
             macos:
    
    83 82
                 # macOS v10.12.0
    

  • tools/update-responses/update_responses
    ... ... @@ -702,6 +702,7 @@ my %actions = (
    702 702
             exit_error "Unknown channel" unless $config->{channels}{$channel};
    
    703 703
             my $versions = as_array($config->{channels}{$channel});
    
    704 704
             foreach my $version (@$versions) {
    
    705
    +            next unless $config->{versions}{$version}{incremental_from};
    
    705 706
                 extract_martools($config, $version);
    
    706 707
                 get_version_files($config, $version);
    
    707 708
                 create_incremental_mars_for_version($config, $version, $channel);