Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ad634955 by Nicolas Vigier at 2023-03-28T08:28:12+02:00 Bug 40826: Correctly set appname_marfile while signing basebrowser nightly - - - - - 3 changed files: - tools/signing/nightly/config.yml - tools/signing/nightly/sign-nightly - tools/signing/nightly/update-responses-base-config.yml Changes: ===================================== tools/signing/nightly/config.yml ===================================== @@ -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 ===================================== @@ -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 ===================================== @@ -1,7 +1,6 @@ --- 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 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/ad... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/ad... You're receiving this email because of your account on gitlab.torproject.org.