Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 48d9876b by Pier Angelo Vendrame at 2023-01-13T15:13:47+01:00 Bug 40738: Update Android git hashes templates

!612 renamed the main git_hash, but did not update the git_hash of nightlies. This commit fixes this error.

- - - - -

3 changed files:

- projects/android-components/config - projects/fenix/config - projects/geckoview/config

Changes:

===================================== projects/android-components/config ===================================== @@ -19,7 +19,7 @@ var: gradle_dependencies_version: 37 gradle_version: 7.0.2 glean_parser: 5.0.1 - git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' + git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/browser_branch") %]'

targets: nightly:

===================================== projects/fenix/config ===================================== @@ -15,7 +15,7 @@ var: fenix_version: 102.2.1 browser_branch: 12.5-1 fenix_build: 1 - git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' + git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/browser_branch") %]' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 37

===================================== projects/geckoview/config ===================================== @@ -150,7 +150,7 @@ steps:

targets: nightly: - git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0

input_files:

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/48...