Unverified Commit 111ff13d authored by boklm's avatar boklm
Browse files

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.
parent 52bcd79d

projects/firefox/build

+1 −1
Original line number Diff line number Diff line
@@ -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

projects/firefox/config

+0 −3
Original line number Diff line number Diff line
@@ -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:

projects/release/create_update_responses_tar

+1 −1
Original line number Diff line number Diff line
@@ -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 %]/*

projects/release/update_responses_config.yml

+1 −1
Original line number Diff line number Diff line
@@ -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") -%]