GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still and

Commit 82606ac4 authored by Matthew Finkel's avatar Matthew Finkel

Bug 40060: Define versionName in Fenix build

In addition, we delete the Fenix specific `version` and we use the
`abbrev` and `osname`.
parent 13a9ee60
......@@ -56,7 +56,8 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
exit 1
$GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint
version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])'
$GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint
# XXX We need the build variant in lower case. Do something smarter here.
v=[% c("variant") %]
cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]
# vim: filetype=yaml sw=2
version: 10.0a6
filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: '[% c("abbrev") %]'
filename: 'fenix-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
......@@ -22,7 +22,6 @@ targets:
git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1'
tag_gpg_id: 0
version: '[% c("abbrev") %]'
variant: Beta
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