commit cd08d1ab0fb638daed52ee5e7452dd78b07591c6 Author: Nicolas Vigier boklm@torproject.org Date: Fri Apr 7 15:53:53 2017 +0200
Switch to ESR52 --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index dd96dcd..a645b92 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
diff --git a/projects/firefox/config b/projects/firefox/config index 83307d0..7e685e7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +## There is no signed tag yet, so we use a fixed commit +git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +#git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +#tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git -tag_gpg_id: 1 gpg_keyring: torbutton.gpg remote_docker: 1
var: - firefox_version: 45.8.0esr + firefox_version: 52.0.2esr torbrowser_branch: 7.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' @@ -22,7 +24,7 @@ var:
targets: nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default