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:
- projects/release/update_responses_config.yml
- rbm.conf
Changes:
=====================================
projects/release/update_responses_config.yml
=====================================
@@ -43,9 +43,12 @@ versions:
[% END -%]
incremental_from:
[% SET incr_from = c("var/nightly") ?
c("var_p/nightly_torbrowser_incremental_from") :
c("var/torbrowser_incremental_from");
- FOREACH v IN incr_from -%]
- - [% v %]
-[% END -%]
+ FOREACH v IN incr_from;
+ SET ver = tmpl(v);
+ IF ver -%]
+ - [% ver %]
+[% END;
+ END -%]
# for example, osx32: osx64
migrate_archs:
# for example, pt-PT: pt-BR
=====================================
rbm.conf
=====================================
@@ -86,7 +86,7 @@ var:
torbrowser_incremental_from:
- '13.0.7'
- '13.0.6'
- - '13.0.5'
+ - '13.0.[% IF c("var/tor-browser") %]5[% ELSE %]4[% END %]'
updater_enabled: 1
build_mar: 1
mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel")
%]'
@@ -304,10 +304,6 @@ targets:
- tr
- zh-CN
- zh-TW
- torbrowser_incremental_from:
- - '13.0.6'
- - '13.0.4'
- - '13.0.1'
torbrowser-testbuild:
- testbuild
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/2ff8efa48b9a8340e3ea69be22027b394639b61d...6733294bde2b9d728c19b27f926b5261184379c7
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/2ff8efa48b9a8340e3ea69be22027b394639b61d...6733294bde2b9d728c19b27f926b5261184379c7
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
