[tbb-commits] [tor-browser-build/maint-11.0] Bug 40384: Make the list of components updates for switch to mozilla95-based Fenix

[aguestuser at torproject.org]

commit 9c27f5c81183a0240105ebd0022ec14ba6cf06c9
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Nov 24 14:53:44 2021 +0100

    Bug 40384: Make the list of components updates for switch to mozilla95-based Fenix
---
 projects/android-components/config               |  2 +-
 projects/application-services/config             |  2 +-
 projects/fenix/config                            |  2 +-
 projects/geckoview/config                        |  2 +-
 projects/geckoview/list_toolchain_updates_checks | 18 ++++++++++++++----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config
index 46024fb..bb81900 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -58,7 +58,7 @@ input_files:
 steps:
   list_toolchain_updates:
     git_url: https://github.com/mozilla-mobile/android-components.git
-    git_hash: releases/94.0
+    git_hash: releases/95.0
     #tag_gpg_id: 0
     var:
       container:
diff --git a/projects/application-services/config b/projects/application-services/config
index 2f90643..857f4e3 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -100,7 +100,7 @@ input_files:
 
 steps:
   list_toolchain_updates:
-    git_hash: 'v85.4.0'
+    git_hash: 'v86.0.1'
     input_files: []
     var:
       container:
diff --git a/projects/fenix/config b/projects/fenix/config
index f39da9b..4896b41 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -59,7 +59,7 @@ input_files:
 steps:
   list_toolchain_updates:
     git_url: https://github.com/mozilla-mobile/fenix.git
-    git_hash: releases_v94.0.0
+    git_hash: releases_v95.0.0
     #tag_gpg_id: 0
     input_files: []
     var:
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 76e0f15..8557c32 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -135,7 +135,7 @@ steps:
 
   list_toolchain_updates:
     git_url: https://github.com/mozilla/gecko-dev.git
-    git_hash: release
+    git_hash: beta
     tag_gpg_id: 0
     input_files: []
     var:
diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks
index 1e55f83..1622b19 100644
--- a/projects/geckoview/list_toolchain_updates_checks
+++ b/projects/geckoview/list_toolchain_updates_checks
@@ -167,20 +167,30 @@ my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml');
 my $clang_toolchain;
 foreach my $t (keys %$d) {
   if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-clang-android-cross') {
-    foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) {
-      $clang_toolchain = $fetch if $fetch =~ m/^clang-.*/;
+    foreach my $fetch (@{$d->{$t}{fetches}{toolchain}}) {
+      $clang_toolchain = $fetch if $fetch =~ m/^.*-clang-.*/;
     }
     last;
   }
 }
 
 if (!$clang_toolchain) {
-  print STDERR "Error: could not find clang toolchain";
+  print STDERR "Error: could not find clang toolchain\\n";
+  exit 1;
+}
+
+my $clang_fetch;
+foreach my $fetch (@{$d->{$clang_toolchain}{fetches}{fetch}}) {
+  $clang_fetch = $fetch if $fetch =~ m/^clang-.*/;
+}
+
+if (!$clang_fetch) {
+  print STDERR "Error: could not find clang fetch\\n";
   exit 1;
 }
 
 my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml');
-print $fetch->{$clang_toolchain}{fetch}{revision};
+print $fetch->{$clang_fetch}{fetch}{revision};
 EOF
 needed=$(perl -MYAML::XS -e "$p")
 current='[% pc("llvm-project", "git_hash") %]'