commit d6fbd77f14e646c7030577cea1b10429129850b4 Author: Nicolas Vigier boklm@torproject.org Date: Fri May 14 11:07:33 2021 +0200
Bug 40297: Use the right commits for get_gradle_dependencies_list --- projects/android-components/config | 4 +++- projects/fenix/config | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/projects/android-components/config b/projects/android-components/config index 3b709a6..1f98428 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -16,10 +16,11 @@ var: gradle_dependencies_version: 24 gradle_version: 6.6.1 glean_parser: 2.2.0 + git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'
targets: nightly: - git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: '[% c("var/git_branch") %]' tag_gpg_id: 0
input_files: @@ -81,5 +82,6 @@ steps: get_gradle_dependencies_list: filename: 'gradle-dependencies-list-[% c("var/android_components_version") %].txt' get_gradle_dependencies_list: '[% INCLUDE build %]' + git_hash: '[% c("var/git_branch") %]^{/Bug 40023: Stop PrivateNotificationService}' var: fetch_gradle_dependencies: 1 diff --git a/projects/fenix/config b/projects/fenix/config index 9a54715..6f349ac 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -10,6 +10,7 @@ variant: Beta var: fenix_version: 88.1.3 torbrowser_branch: 10.5 + git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: use_container: 1 @@ -20,7 +21,7 @@ var:
targets: nightly: - git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: '[% c("var/git_branch") %]' tag_gpg_id: 0 variant: Nightly
@@ -64,6 +65,7 @@ steps: use_container: 0
get_gradle_dependencies_list: + git_hash: '[% c("var/git_branch") %]^{/Add Tor integration and UI}' filename: 'gradle-dependencies-list-[% c("var/fenix_version") %].txt' get_gradle_dependencies_list: '[% INCLUDE build %]' var: