[tor-commits] [tor-browser-build/master] Bug 40321: Check glean_parser version needed by application-services

[sysrqb@xxxxxxxxxxxxxx]

commit 12d27baf5b08382af73746ed33829ef36d20fe31
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Tue Jun 29 18:51:41 2021 +0200

    Bug 40321: Check glean_parser version needed by application-services
---
 projects/application-services/config               | 15 +++++++++++++
 .../list_toolchain_updates_checks                  | 25 +++++++++++-----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/projects/application-services/config b/projects/application-services/config
index 93f8f5c..c76afe1 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -99,6 +99,21 @@ steps:
     var:
       container:
         use_container: 0
+      get_android_components_version: |
+        #!/bin/bash
+        read -d '' p << 'EOF' || true
+        if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) {
+          print $1;
+          exit;
+        }
+        EOF
+        perl -ne "$p" < build.gradle
+      android_components_version: '[% exec(c("var/get_android_components_version")) %]'
+      glean_version: '[% pc("android-components", "var/glean_version", { git_hash => "v" _ c("var/android_components_version") }) %]'
+    input_files:
+      - name: glean
+        project: glean
+        pkg_type: src
 
   get_gradle_dependencies_list:
     filename: 'gradle-dependencies-list-[% c("version") %].txt'
diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks
index b028d10..f80eda8 100644
--- a/projects/application-services/list_toolchain_updates_checks
+++ b/projects/application-services/list_toolchain_updates_checks
@@ -36,6 +36,19 @@ current=21
 check_update_needed minSdkVersion "$needed" "$current"
 
 
+# glean_parser
+read -d '' p << 'EOF' || true
+if (m/^\\s*"glean_parser==([^"]+)",/) {
+  print $1;
+  exit;
+}
+EOF
+tar xf $rootdir/[% c('input_files_by_name/glean') %]
+needed=$(cat glean-[% c("var/glean_version") %]/glean-core/python/setup.py | perl -ne "$p")
+current='[% c("var/glean_parser") %]'
+check_update_needed glean_parser "$needed" "$current"
+
+
 # gradle
 read -d '' p << 'EOF' || true
 if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)-.*.zip|) {
@@ -83,15 +96,3 @@ needed=$(cat build.gradle | perl -ne "$p")
 current='4.0.1'
 check_update_needed android-gradle-plugin "$needed" "$current"
 
-
-# android-components
-read -d '' p << 'EOF' || true
-if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) {
-  print $1;
-  exit;
-}
-EOF
-needed=$(cat build.gradle | perl -ne "$p")
-current=71.0.0
-check_update_needed android-components "$needed" "$current"
-



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits