commit 46c2b00c782ad2f977125e9e3283c0944409a30e Author: Matthew Finkel sysrqb@torproject.org Date: Mon Sep 28 23:01:14 2020 +0000
Bug 40060: Define versionName in Fenix build
In addition, we delete the hard-coded Fenix specific `version` and we use `abbrev`, instead. --- projects/fenix/build | 3 ++- projects/fenix/config | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/projects/fenix/build b/projects/fenix/build index eedddcc..c9d7e22 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -56,7 +56,8 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ exit 1 fi
- $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 %] diff --git a/projects/fenix/config b/projects/fenix/config index 171eb6b..1798e0d 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 10.0a6 +version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git @@ -22,7 +22,6 @@ targets: nightly: git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 - version: '[% c("abbrev") %]' variant: Beta
input_files: