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

Commits:

2 changed files:

Changes:

  • projects/release/update_responses_config.yml
    ... ... @@ -30,6 +30,9 @@ build_targets:
    30 30
     channels:
    
    31 31
         [% c('var/channel') %]:
    
    32 32
           - [% c("var/torbrowser_version") %]
    
    33
    +[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%]
    
    34
    +      - [% c("var/torbrowser_legacy_version") %]
    
    35
    +[% END -%]
    
    33 36
     versions:
    
    34 37
         [% c("var/torbrowser_version") %]:
    
    35 38
     [% IF c("var/create_unsigned_incrementals") -%]
    
    ... ... @@ -66,6 +69,25 @@ versions:
    66 69
                 minSupportedInstructionSet: SSE2
    
    67 70
             linux-x86_64:
    
    68 71
                 minSupportedInstructionSet: SSE2
    
    72
    +[% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%]
    
    73
    +    [% c("var/torbrowser_legacy_version") %]:
    
    74
    +        mar_channel_id: [% c('var/mar_channel_id') %]
    
    75
    +        platformVersion: [% c('var/torbrowser_legacy_platform_version') %]
    
    76
    +        detailsURL: https://blog.torproject.org/new[% IF c("var/alpha") %]-alpha[% END %]-release-tor-browser-[% c("var/torbrowser_legacy_version") FILTER remove('\.') %]
    
    77
    +        # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) )
    
    78
    +        macos:
    
    79
    +            # macOS v10.12.0
    
    80
    +            minSupportedOSVersion: 16.0.0
    
    81
    +        # minSupportedOsVersion on Windows corresponds to the operating system version ( https://docs.microsoft.com/en-us/windows/win32/sysinfo/operating-system-version )
    
    82
    +        windows-i686:
    
    83
    +            # Windows 7
    
    84
    +            minSupportedOSVersion: 6.1
    
    85
    +            minSupportedInstructionSet: SSE2
    
    86
    +        windows-x86_64:
    
    87
    +            # Windows 7
    
    88
    +            minSupportedOSVersion: 6.1
    
    89
    +            minSupportedInstructionSet: SSE2
    
    90
    +[% END -%]
    
    69 91
     mar_compression: xz
    
    70 92
     [% IF c("var/tor-browser") -%]
    
    71 93
     tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]'
    
    ... ... @@ -96,4 +118,9 @@ htaccess_rewrite_rules:
    96 118
             RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last]
    
    97 119
             RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last]
    
    98 120
             RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last]
    
    121
    +        # tor-browser-build#41270: make 13.5.7 a watershed update
    
    122
    +        RewriteRule ^[^/]+/1[12]\.[05].*/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last]
    
    123
    +        RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last]
    
    124
    +        RewriteRule ^[^/]+/13\.5/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last]
    
    125
    +        RewriteRule ^[^/]+/13\.5\.[0123456]/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last]
    
    99 126
     [% END -%]

  • rbm.conf
    ... ... @@ -104,6 +104,9 @@ var:
    104 104
         - '[% IF c("var/mullvad-browser") %]14.0.5[% END %]'
    
    105 105
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
    
    106 106
     
    
    107
    +  torbrowser_legacy_version: 13.5.15
    
    108
    +  torbrowser_legacy_platform_version: 115.22.0
    
    109
    +
    
    107 110
       # By default, we sort the list of installed packages. This allows sharing
    
    108 111
       # containers with identical list of packages, even if they are not listed
    
    109 112
       # in the same order. In the cases where the installation order is