Bug 41056: Make it possible to use templates in var/torbrowser_incremental_from

Merge Info

Related Issues

• #41056 (closed)

Backporting

Timeline

• Immediate: patchset needed as soon as possible
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport
• No Backport (preferred): patchset for the next major stable

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Other: please explain

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, richard
  • localization : henry, pierov
  • macos : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : boklm, dan, ma1, pierov, richard
  • security : ma1
  • signing : boklm, richard
  • updater : pierov
  • misc/other : pierov, richard

Change Description

Makes it possible to use templates in var/torbrowser_incremental_from

How Tested

Tested with this change:

diff --git a/rbm.conf b/rbm.conf
index befb4d80b..e94ebb7d1 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -84,9 +84,11 @@ var:
   torbrowser_version: '13.5a3'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
+    - '[% IF c("var/tor-browser") %]tb1[% END %]'
     - '13.0a6'
     - '13.5a1'
     - '13.5a2'
+    - '[% c("var/project-name") %]'
   updater_enabled: 1
   build_mar: 1
   mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'

And:

$ ./rbm/rbm showconf release update_responses_config --step update_responses_config --target torbrowser --target alpha
[...]
        incremental_from:
          - tb1
          - 13.0a6
          - 13.5a1
          - 13.5a2
          - tor-browser
[...]
$ ./rbm/rbm showconf release update_responses_config --step update_responses_config --target mullvadbrowser --target alpha
[...]
        incremental_from:
          - 13.0a6
          - 13.5a1
          - 13.5a2
          - mullvad-browser
[...]