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.

Bug 40101: Pick up 81.1.1 updates

We bump Fenix to 81.1.1 and android-components to 57.0.6 while GeckoView
is staying on 81.0b9 to save us another round of rebasing.

It turns out that declaring a `beta_version` and including that in the
version number for a branch name might not have been the best idea given
that not all our branches are based on mozilla-beta. So, we drop that
and add the beta version directly when needed.
parent 4f9ab234
# vim: filetype=yaml sw=2
version: 57.0.0
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: c84cf8e7736ee77c22c75ca9f0397b202e489991 # v57.0.0
git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
git_url: https://gitlab.torproject.org/tpo/applications/android-components.git
tag_gpg_id: 1
gpg_keyring: torbutton.gpg
var:
android_components_version: 57.0.6
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
targets:
nightly:
git_hash: 'android-components-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'
tag_gpg_id: 0
input_files:
- project: container-image
- name: '[% c("var/compiler") %]'
......
......@@ -8,14 +8,13 @@ gpg_keyring: torbutton.gpg
variant: Beta
var:
fenix_version: '81.1.0b[% c("var/beta_version") %]'
beta_version: 1
fenix_version: 81.1.1
torbrowser_branch: 10.0
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 4
gradle_dependencies_version: 5
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
......
This diff is collapsed.
......@@ -8,8 +8,7 @@ git_submodule: 1
gpg_keyring: torbutton.gpg
var:
geckoview_version: '81.0b[% c("var/beta_version") %]'
beta_version: 2
geckoview_version: 81.0b9
torbrowser_branch: 10.0
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
......
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