GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

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

Bug 40068: Bump versions for 81.1.0b1

We make small adjustments while bumping the versions:

a) We remove the explicit nightly target for `android-components`. If we
need it at some point we can add it back. Meanwhile duplicating the
commits/versions has just additional costs for us when bumping them and
it is not clear anyway that we want to use a non-release commit for
`android-components` in our builds.

b) We adapt the targets in Fenix as all of them got simplified into
`debug`, `nightly`, `beta`, and `release`.
parent ca725ba9
# vim: filetype=yaml sw=2
version: v52.0.3
version: 57.0.0
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: 98aedbeb17261966052dda3dbd9b2953e015e435 # v52.0.3
git_hash: c84cf8e7736ee77c22c75ca9f0397b202e489991 # v57.0.0
git_url: https://github.com/mozilla-mobile/android-components
var:
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 1
gradle_dependencies_version: 2
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
targets:
nightly:
version: '[% c("abbrev") %]'
git_hash: 98aedbeb17261966052dda3dbd9b2953e015e435
input_files:
- project: container-image
- name: '[% c("var/compiler") %]'
......
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: 61.0.10
git_hash: 2478bcf2b48d1867b01e8b7df4f86a69d564d49a # v61.0.10
version: 61.0.13
git_hash: 8faa8313bcec03775ddaa194438391c4731eb840 # v61.0.13
git_url: https://github.com/mozilla/application-services
var:
......
......@@ -30,7 +30,7 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/* app/
cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
[% IF c("var/fetch_gradle_dependencies") %]
gradle --debug --no-daemon app:assemble[% c('build_flavor') %] -x lint
gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint
[% ELSE %]
patch -p1 < $rootdir/mavenLocal.patch
......@@ -38,12 +38,10 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
# not only for geckoview-beta.
cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar
gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('build_flavor') %] -x lint
# We have both the Gecko and the Fenix type in upper camel case. But the path to
# the .apks is in lower camel case.
gf=[% c("gecko_flavor") %]
ff=[% c("fenix_flavor") %]
cp app/build/outputs/apk/${gf,}/${ff,}/*.apk $distdir/[% project %]
gradle --offline --no-daemon -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 %]
cd $distdir
[% c('tar', {
......
......@@ -5,18 +5,16 @@ git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch"
git_url: https://gitlab.torproject.org/tpo/applications/fenix.git
tag_gpg_id: 1
gpg_keyring: torbutton.gpg
gecko_flavor: 'GeckoBeta'
fenix_flavor: 'FennecProduction'
build_flavor: '[% c("gecko_flavor") %][% c("fenix_flavor") %]'
variant: Beta
var:
fenix_version: '80.0b[% c("var/beta_version") %]'
beta_version: 6
torbrowser_branch: 10
fenix_version: '81.1.0b[% c("var/beta_version") %]'
beta_version: 1
torbrowser_branch: 10.0
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 2
gradle_dependencies_version: 3
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
......@@ -25,7 +23,7 @@ targets:
git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1'
tag_gpg_id: 0
version: '[% c("abbrev") %]'
fenix_flavor: 'Debug'
variant: Beta
input_files:
- project: container-image
......
This diff is collapsed.
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