Unverified Commit ad634955 authored by boklm's avatar boklm
Browse files

Bug 40826: Correctly set appname_marfile while signing basebrowser nightly

parent 8ea251b1

tools/signing/nightly/config.yml

+2 −0
Changes for tools/signing/nightly/config.yml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ torbrowser: 
    - nightly-windows-i686

    - nightly-macos

  nss_db_dir: nssdb

  appname_marfile: tor-browser

basebrowser:

  publish_dirs:

    - basebrowser-nightly-linux-x86_64
@@ -19,6 +20,7 @@ basebrowser: 
    - basebrowser-nightly-windows-i686

    - basebrowser-nightly-macos

  nss_db_dir: nssdb-basebrowser-1

  appname_marfile: base-browser

nss_certname: nightly-marsigner

gpg_keyring: keyring/torbrowser-nightly.gpg

rsync_dest: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-updates/

tools/signing/nightly/sign-nightly

+1 −0
Changes for tools/signing/nightly/sign-nightly: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ sub update_responses { 
    my $ur_config = LoadFile("$FindBin::Bin/update-responses-base-config.yml");

    $ur_config->{download}{mars_url} .= "/$publish_dir";

    $ur_config->{releases_dir} = "$topdir/nightly/$publish_dir";

    $ur_config->{appname_marfile} = get_config('appname_marfile');

    $ur_config->{channels}->{nightly} = $version;

    $ur_config->{versions}->{$version} = $ur_config->{versions}->{nightly_version};

    my $buildinfos = get_buildinfos("$topdir/nightly/$publish_dir/$version/build-infos.json");

tools/signing/nightly/update-responses-base-config.yml

+0 −1
Changes for tools/signing/nightly/update-responses-base-config.yml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
---

download:

    mars_url: https://nightlies.tbb.torproject.org/nightly-updates

appname_marfile: tor-browser

build_targets:

    linux32: Linux_x86-gcc3

    linux64: Linux_x86_64-gcc3