richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 2936205f by Nicolas Vigier at 2023-08-23T19:07:33+02:00 Bug 40932: Clean up projects/release/update_responses_config.yml

Remove appname_bundle_android, appname_bundle_macos, appname_bundle_linux, appname_bundle_win32, appname_bundle_win64 from projects/release/update_responses_config.yml since they are not used anymore after 9f201283811ec85c49ca81d27b728411e952a02b.

- - - - - 6c264f8e by Nicolas Vigier at 2023-08-23T19:07:35+02:00 Bug 40931: Fix incrementals after #40829

We update tools/signing/nightly to fix signing of nightly incrementals.

We also update tools/update-responses/update_responses to fix the regexp to match .mar and incremental.mar filenames, since the OS now includes a `-` (except for macos).

We change the incremental filenames to use `--` instead of `-` to separate OS and old_version, to make it easier to parse since both of those can include a `-`.

- - - - -

5 changed files:

- projects/release/update_responses_config.yml - tools/signing/nightly/config.yml - tools/signing/nightly/sign-nightly - tools/signing/nightly/update-responses-base-config.yml - tools/update-responses/update_responses

Changes:

===================================== projects/release/update_responses_config.yml ===================================== @@ -3,11 +3,6 @@ tmp_dir: '[% c("tmp_dir") %]' create_downloads_json: 1 appname_marfile: '[% c("var/project-name") %]' appname_bundle: '[% c("var/project-name") %]' -appname_bundle_android: '[% c("var/project-name") %]' -appname_bundle_macos: '[% c("var/ProjectName") %]' -appname_bundle_linux: '[% c("var/project-name") %]' -appname_bundle_win32: '[% c("var/projectname") %]-install' -appname_bundle_win64: '[% c("var/projectname") %]-install-win64' releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %] download: gpg_keyring: ../../keyring/torbrowser.gpg

===================================== tools/signing/nightly/config.yml ===================================== @@ -12,6 +12,7 @@ torbrowser: - nightly-macos nss_db_dir: nssdb appname_marfile: tor-browser + appname_bundle: tor-browser basebrowser: publish_dirs: - basebrowser-nightly-linux-x86_64 @@ -21,6 +22,7 @@ basebrowser: - basebrowser-nightly-macos nss_db_dir: nssdb-basebrowser-1 appname_marfile: base-browser + appname_bundle: 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 ===================================== @@ -246,6 +246,7 @@ sub update_responses { $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->{appname_bundle} = get_config('appname_bundle'); $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 ===================================== @@ -2,13 +2,13 @@ download: mars_url: https://nightlies.tbb.torproject.org/nightly-updates build_targets: - linux32: Linux_x86-gcc3 - linux64: Linux_x86_64-gcc3 - win32: + linux-i686: Linux_x86-gcc3 + linux-x86_64: Linux_x86_64-gcc3 + windows-i686: - WINNT_x86-gcc3 - WINNT_x86-gcc3-x86 - WINNT_x86-gcc3-x64 - win64: WINNT_x86_64-gcc3-x64 + windows-x86_64: WINNT_x86_64-gcc3-x64 macos: - Darwin_x86_64-gcc3 - Darwin_aarch64-gcc3 @@ -16,20 +16,20 @@ channels: nightly: nightly_version versions: nightly_version: - platformVersion: 68.2.0 + platformVersion: 115.1.0 detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/ migrate_langs: pt-PT: pt-BR macos: minSupportedOSVersion: 16.0.0 - win32: + windows-i686: minSupportedOSVersion: 6.1 minSupportedInstructionSet: SSE2 - win64: + windows-x86_64: minSupportedOSVersion: 6.1 minSupportedInstructionSet: SSE2 - linux32: + linux-i686: minSupportedInstructionSet: SSE2 - linux64: + linux-x86_64: minSupportedInstructionSet: SSE2 mar_compression: xz

===================================== tools/update-responses/update_responses ===================================== @@ -98,7 +98,7 @@ sub get_version_files { opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; - if ($file =~ m/^$appname-([^-]+)-${version}_(.+).mar$/) { + if ($file =~ m/^$appname-(.+)-${version}_(.+).mar$/) { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', @@ -109,7 +109,7 @@ sub get_version_files { }; next; } - if ($file =~ m/^$appname-([^-]+)-(.+)-${version}_(.+).incremental.mar$/) { + if ($file =~ m/^$appname-(.+)--(.+)-${version}_(.+).incremental.mar$/) { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', @@ -223,7 +223,7 @@ sub mar_filename { sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang, $channel) = @_; my $appname = $config->{appname_marfile}; - my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; + my $mar_file = "$appname-$os--${from_version}-${new_version}_$lang.incremental.mar"; my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n";

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/b...