Unverified Commit 24786d3d authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Pick up Firefox's build2

parent d268b64f

projects/firefox-langpacks/config

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil 


var:

  ff_version: '[% pc("firefox", "var/firefox_version") %]'

  ff_build: build1

  ff_build: build2

  input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'



targets:

projects/firefox/config

+2 −2
Original line number Diff line number Diff line 
# 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'

git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'

tag_gpg_id: 1

git_url: https://git.torproject.org/tor-browser.git

git_submodule: 1
@@ -49,7 +49,7 @@ targets: 
      branding_directory: 'browser/branding/official'



  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:

      branding_directory: 'browser/branding/nightly'

rbm.conf

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ buildconf: 


var:

  torbrowser_version: '10.0.9'

  torbrowser_build: 'build1'

  torbrowser_build: 'build2'

  torbrowser_incremental_from:

    - 10.0.7

    - 10.0.8