Unverified Commit b13fc9ac authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'gitlab/merge-requests/80' into master

parents f879decd f733e4ff
......@@ -10,8 +10,9 @@ if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) {
$date = sprintf("%d%02d%02d010101", $1, $2, $3);
} elsif ($version eq 'testbuild') {
# There is no need for an increasing build date in test builds. Just hardcode
# it.
$date = 20010101010101;
# it to a value that is compatible with the v1 versionCode scheme on Android,
# see: #34163.
$date = 20150801000000;
} else {
my @v = split(/[\.ab]/, $version);
push @v, '0' if @v < 4;
......
......@@ -54,9 +54,6 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
then
echo "MOZ_BUILD_DATE is not set"
exit 1
else
# We only need a MMddHHmmss format and thus no year.
MOZ_BUILD_DATE=${MOZ_BUILD_DATE:4}
fi
$GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment