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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.0] 2 commits: Bug 41056: Make it possible to use templates in var/torbrowser_incremental_from

Title: GitLab

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

Commits:

  • f086ab55
    by Nicolas Vigier at 2023-12-21T08:36:41+01:00 
    Bug 41056: Make it possible to use templates in var/torbrowser_incremental_from
  • 6733294b
    by Nicolas Vigier at 2023-12-21T08:40:11+01:00 
    Bug 41056: Use single var/torbrowser_incremental_from list

2 changed files:

Changes:

  • projects/release/update_responses_config.yml
    ... ... @@ -43,9 +43,12 @@ versions:
    43 43 
     [% END -%]
    44 44 
             incremental_from:
    45 45 
     [% SET incr_from = c("var/nightly") ? c("var_p/nightly_torbrowser_incremental_from") : c("var/torbrowser_incremental_from");
    46 
    -   FOREACH v IN incr_from -%]
    47 
    -          - [% v %]
    48 
    -[% END -%]
    46 
    +   FOREACH v IN incr_from;
    47 
    +     SET ver = tmpl(v);
    48 
    +     IF ver -%]
    49 
    +          - [% ver %]
    50 
    +[%   END;
    51 
    +   END -%]
    49 52 
             # for example, osx32: osx64
    50 53 
             migrate_archs:
    51 54 
             # for example, pt-PT: pt-BR

  • rbm.conf
    ... ... @@ -86,7 +86,7 @@ var:
    86 86 
       torbrowser_incremental_from:
    87 87 
         - '13.0.7'
    88 88 
         - '13.0.6'
    89 
    -    - '13.0.5'
    89 
    +    - '13.0.[% IF c("var/tor-browser") %]5[% ELSE %]4[% END %]'
    90 90 
       updater_enabled: 1
    91 91 
       build_mar: 1
    92 92 
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
    ... ... @@ -304,10 +304,6 @@ targets:
    304 304 
             - tr
    305 305 
             - zh-CN
    306 306 
             - zh-TW
    307 
    -      torbrowser_incremental_from:
    308 
    -        - '13.0.6'
    309 
    -        - '13.0.4'
    310 
    -        - '13.0.1'
    311 307
    312 308 
       torbrowser-testbuild:
    313 309 
         - testbuild

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits