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

Commits:

2 changed files:

Changes:

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

  • rbm.conf
    ... ... @@ -133,6 +133,9 @@ var:
    133 133
         - 14.5a6
    
    134 134
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
    
    135 135
     
    
    136
    +#  torbrowser_legacy_version: 13.5.22
    
    137
    +#  torbrowser_legacy_platform_version: 115.28.0
    
    138
    +
    
    136 139
       # By default, we sort the list of installed packages. This allows sharing
    
    137 140
       # containers with identical list of packages, even if they are not listed
    
    138 141
       # in the same order. In the cases where the installation order is