Skip to content
Snippets Groups Projects
Verified Commit b428d050 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 41457: Set mar IDs in tor-browser-build.

We used to have a logic to set the mar IDs in confvars.sh but, from
Firefox 137, that file can contains only key/value without any logic.
parent 2010ef74
Branches
Tags
1 merge request!1212Bug 41448: Desktop toolchain update
......@@ -35,6 +35,8 @@ var:
# For testing purposes use override_updater_url, as it will also override the
# certificate.
updater_url: 'https://aus1.torproject.org/torbrowser/update_3/'
mar_id_prefix: 'torbrowser-torproject'
mar_channel_id: '[% c("var/mar_id_prefix") %]-[% c("var/channel") %]'
# Uncomment this if you want to test the updater. You will need to provide a
# marsigner.der in this directory, too. It will replace either the release
......@@ -94,6 +96,7 @@ targets:
basebrowser:
var:
nightly_updates_publish_dir_prefix: basebrowser-
mar_id_prefix: 'basebrowser-torproject'
nightly:
git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
......@@ -106,7 +109,9 @@ targets:
var:
gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
mar_id_prefix: 'mullvadbrowser-mullvad'
nightly_updates_publish_dir_prefix: mullvadbrowser-
linux-x86_64:
var:
arch_deps:
......
......@@ -85,6 +85,9 @@ mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]
export MOZ_APP_REMOTINGNAME="[% c('var/display_name') %]"
export MAR_CHANNEL_ID="[% c('var/mar_channel_id') %]"
export ACCEPTED_MAR_CHANNEL_IDS="[% c('var/mar_channel_id') %]"
export MOZ_INCLUDE_SOURCE_INFO=1
export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]"
export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment