[tbb-commits] [tor-browser-build/master] Bug 32497: Change nightly update channel to nightly

[gk at torproject.org]

commit 111ff13d612e5bfc830f19b3a001136db6baf477
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Nov 20 17:55:37 2019 +0100

    Bug 32497: Change nightly update channel to nightly
    
    Previously we used "default" as the channel name for nightly builds,
    which is the channel name intended for local builds. We are now
    switching to "nightly" as the channel name.
---
 projects/firefox/build                       | 2 +-
 projects/firefox/config                      | 3 ---
 projects/release/create_update_responses_tar | 2 +-
 projects/release/update_responses_config.yml | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 456aa07..53d425b 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -101,7 +101,7 @@ rm -f configure
 rm -f js/src/configure
 
 # Android does not support --enable-bundled-fonts option
-./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] [% IF ! c("var/android") %]--enable-bundled-fonts[% END -%] --with-branding=[% c("var/branding_directory") %]
+./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/channel") %] [% IF ! c("var/android") %]--enable-bundled-fonts[% END -%] --with-branding=[% c("var/branding_directory") %]
 
 ./mach build --verbose
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 3c57c71..09d0b1b 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -11,7 +11,6 @@ var:
   firefox_platform_version: 68.2.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.5
-  torbrowser_update_channel: alpha
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
@@ -47,14 +46,12 @@ steps:
 targets:
   release:
     var:
-      torbrowser_update_channel: release
       branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official'
 
   nightly:
     git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
     tag_gpg_id: 0
     var:
-      torbrowser_update_channel: default
       branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly'
 
   android:
diff --git a/projects/release/create_update_responses_tar b/projects/release/create_update_responses_tar
index ee1180f..9c64936 100644
--- a/projects/release/create_update_responses_tar
+++ b/projects/release/create_update_responses_tar
@@ -2,7 +2,7 @@
 [% c("var/set_default_env") -%]
 [% shell_quote(c("basedir")) %]/tools/update-responses/update_responses
 mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses
-[% SET channel = pc('firefox', 'var/torbrowser_update_channel') -%]
+[% SET channel = c('var/channel') -%]
 mv [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% channel %]
 chmod 775 [% channel %]
 chmod 664 [% channel %]/.htaccess [% channel %]/*
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 4497114..f2542d6 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -22,7 +22,7 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %]
+    [% c('var/channel') %]: [% c("var/torbrowser_version") %]
 versions:
     [% c("var/torbrowser_version") %]:
 [% IF c("var/create_unsigned_incrementals") -%]