[tor-commits] [tor-browser-build/master] Bug 40379: Update components for mozilla94: glean part

[sysrqb at torproject.org]

commit 51cd9dbb3b137e432a7abf8ece15021c2f958a49
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Oct 29 16:22:14 2021 +0200

    Bug 40379: Update components for mozilla94: glean part
---
 projects/android-components/config   |  4 ++--
 projects/application-services/config |  4 ++--
 projects/fenix/config                |  4 ++--
 projects/glean/config                | 10 ++++++++--
 rbm.conf                             |  2 --
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config
index 8d5042c..17fd8c3 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -48,9 +48,9 @@ input_files:
   - filename: git.patch
   - filename: mavenLocal.patch
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
-  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz
+  - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
     name: glean
-    sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1
+    sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
   - filename: gen_gradle_deps_file.sh
     enable: '[% c("var/fetch_gradle_dependencies") %]'
diff --git a/projects/application-services/config b/projects/application-services/config
index 55c6700..a7d21c3 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -85,9 +85,9 @@ input_files:
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
-  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz
+  - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
     name: glean-wheels
-    sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1
+    sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
   # Use `make cargo_vendor-application-services` to re-generate the vendor tarball
   - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-vendor-[% c('version') %].tar.bz2
diff --git a/projects/fenix/config b/projects/fenix/config
index d90ac07..a104d44 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -47,9 +47,9 @@ input_files:
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
-  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz
+  - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
     name: glean
-    sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1
+    sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]'
   - filename: mavenLocal.patch
   - project: tor-android-service
     name: tor-android-service
diff --git a/projects/glean/config b/projects/glean/config
index 66eb272..cbd55e0 100644
--- a/projects/glean/config
+++ b/projects/glean/config
@@ -18,12 +18,18 @@ var:
     - python3-pip
     - torsocks
     - xz-utils
+  glean_wheels_sha256sum:
+    3.4.0: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1
+    4.0.0: c974113bd8671364c592fea9b64bac660b59d4f03a7dcecd4dd4e0c355431db8
+  glean_wheels_url:
+    3.4.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-3.4.0-build2.tar.xz
+    4.0.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.0.0.tar.xz
 
 steps:
   create_glean_deps_tarball:
     git_url: ''
-    version: 3.4.0
-    filename: 'glean-wheels-[% c("version") %]-build2.tar.xz'
+    version: 4.0.0
+    filename: 'glean-wheels-[% c("version") %].tar.xz'
     build_log: '-'
     var:
       container:
diff --git a/rbm.conf b/rbm.conf
index 19d41ce..e09ee13 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -305,8 +305,6 @@ targets:
       # API 21 is the minimum we currently support for 64 bit on Android
       android_min_api_x86_64: 21
       android_min_api_aarch64: 21
-      # This is needed to get the offline build part for Glean right.
-      glean_parser: 1.29.0
       container:
         suite: bullseye
         arch: amd64