Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
237ce1c4 by Pier Angelo Vendrame at 2023-02-21T17:16:26+01:00
Bug 40794: Make the language list change the build id of firefox-l10n
- - - - -
1 changed file:
- projects/firefox-l10n/config
Changes:
=====================================
projects/firefox-l10n/config
=====================================
@@ -1,6 +1,6 @@
# vim: filetype=yaml sw=2
version: '[% pc("firefox", "abbrev") %]'
-filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-1'
+filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]'
link_input_files: 1
steps:
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
757d8f9d by Richard Pospesel at 2023-02-20T15:42:43+00:00
Bug 40792: signing scripts missing project name prefix to make rule
- - - - -
2 changed files:
- tools/signing/dmg2mar
- tools/signing/upload-update_responses-to-staticiforme
Changes:
=====================================
tools/signing/dmg2mar
=====================================
@@ -27,4 +27,4 @@ test "$nb_locales" -eq "$nb_bundles" || \
mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/
-make dmg2mar-$tbb_version_type
+make $SIGNING_PROJECTNAME-dmg2mar-$tbb_version_type
=====================================
tools/signing/upload-update_responses-to-staticiforme
=====================================
@@ -10,11 +10,11 @@ update_responses_tar_filename="update-responses-$tbb_version_type-$tbb_version.t
update_responses_tar="$script_dir/../../$SIGNING_PROJECTNAME/$tbb_version_type/update-responses/$update_responses_tar_filename"
if test -f "$update_responses_tar"
then
- echo "$update_responses_tar_filename already exists: not running 'make update_responses-$tbb_version_type'"
+ echo "$update_responses_tar_filename already exists: not running 'make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type'"
else
- echo "Running 'make update_responses-$tbb_version_type'"
+ echo "Running 'make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type'"
pushd "$script_dir/../.." > /dev/null
- make update_responses-$tbb_version_type
+ make $SIGNING_PROJECTNAME-update_responses-$tbb_version_type
popd > /dev/null
fi
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build
Commits:
b7e2bdc3 by Nicolas Vigier at 2023-02-17T16:42:43+00:00
Bug 40791: Make sure dmg2mar exits with an error when something failed
If the child process failed, make sure we exit with an error in the
parent process too.
(cherry picked from commit cf22cd266c5892f683306b84ca6b1363258ed6ae)
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -106,7 +106,11 @@ sub get_dmg_files_from_sha256sums {
sub convert_files {
my ($channel) = @_;
my $pm = Parallel::ForkManager->new(get_nbprocs);
- $pm->run_on_finish(sub { print "Finished $_[2]\n" });
+ $pm->run_on_finish(
+ sub {
+ exit_error "Failed while running $_[2]" unless $_[1] == 0;
+ print "Finished $_[2]\n";
+ });
foreach my $file (get_dmg_files_from_sha256sums) {
# The 'ja' locale is a special case: it is called 'ja-JP-mac'
# internally on OSX, but the dmg file still uses 'ja' to avoid
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
a22a592f by Nicolas Vigier at 2023-02-17T15:59:09+01:00
Bug 40790: Fix dmg2mar after dmg changes from #28124
- - - - -
cf22cd26 by Nicolas Vigier at 2023-02-17T17:13:37+01:00
Bug 40791: Make sure dmg2mar exits with an error when something failed
If the child process failed, make sure we exit with an error in the
parent process too.
- - - - -
1 changed file:
- tools/dmg2mar
Changes:
=====================================
tools/dmg2mar
=====================================
@@ -106,7 +106,11 @@ sub get_dmg_files_from_sha256sums {
sub convert_files {
my ($channel) = @_;
my $pm = Parallel::ForkManager->new(get_nbprocs);
- $pm->run_on_finish(sub { print "Finished $_[2]\n" });
+ $pm->run_on_finish(
+ sub {
+ exit_error "Failed while running $_[2]" unless $_[1] == 0;
+ print "Finished $_[2]\n";
+ });
foreach my $file (get_dmg_files_from_sha256sums) {
# The 'ja' locale is a special case: it is called 'ja-JP-mac'
# internally on OSX, but the dmg file still uses 'ja' to avoid
@@ -128,9 +132,11 @@ sub convert_files {
my $oldmar = getcwd . '/' . $output;
exit_error "Error extracting $output"
unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0;
+ my $appdir = "$tmpdir/$appname/$appname.app";
+ exit_error "Missing directory $appdir" unless -d $appdir;
my $wanted = sub {
my $file = $File::Find::name;
- $file =~ s{^$tmpdir/$appname\.app/}{};
+ $file =~ s{^$appdir/}{};
if (-f "$tmpdir_oldmar/$file") {
my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file");
chmod $mode, $File::Find::name;
@@ -139,14 +145,14 @@ sub convert_files {
chmod 0644, $File::Find::name if -f $File::Find::name;
chmod 0755, $File::Find::name if -d $File::Find::name;
};
- find($wanted, "$tmpdir/$appname.app");
+ find($wanted, $appdir);
unlink $output;
local $ENV{MOZ_PRODUCT_VERSION} = $file->{version};
local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel";
local $ENV{TMPDIR} = $tmpdir;
(undef, $err, $success) = capture_exec('make_full_update.sh', '-q',
- $output, "$tmpdir/$appname.app");
+ $output, $appdir);
exit_error "Error updating $output: $err" unless $success;
exit_error "make_full_update.sh failed. $output does not exist."
unless -f $output;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
You're receiving this email because of your account on gitlab.torproject.org.