Commit 8bf6a779 authored by brizental's avatar brizental Committed by brizental
Browse files

Bug 41523: Rename glean project to glean-parser 

Also do a bit of housekeeping and cleanup.
parent 84207b5d

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -618,10 +618,10 @@ list_toolchain_updates-geckoview: submodule-update 
	$(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7



create_glean_deps_tarball: submodule-update

	 $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7

	 $(rbm) build glean-parser --target alpha --target torbrowser-android-armv7



create_glean_deps_tarball-with_torsocks: submodule-update

	$(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks

	$(rbm) build glean-parser --target alpha --target torbrowser-android-armv7 --target with_torsocks



get_gradle_dependencies_list-fenix: submodule-update

	$(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7

projects/application-services/config

+2 −2
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ steps: 
        name: gradle-dependencies

        exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

        enable: '[% !c("var/fetch_gradle_dependencies") %]'

      - URL: '[% pc("glean", "var/glean_wheels_url") %]'

      - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]'

        name: glean-wheels

        sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum") %]'

        sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]'

        enable: '[% !c("var/fetch_gradle_dependencies") %]'

      - name: cargo_vendor

        project: application-services

projects/geckoview/config

+4 −4
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ steps: 
        pkg_type: tor-browser

        enable: '[% c("var/has_l10n") %]'

      - filename: rename-branding-strings.py

      - URL: '[% pc("glean", "var/glean_wheels_url") %]'

      - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]'

        name: glean-wheels

        sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum") %]'

        sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]'

      - name: tor-expert-bundle-aar

        project: tor-expert-bundle-aar

        pkg_type: build
@@ -159,9 +159,9 @@ input_files: 
  - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'

    name: gradle-dependencies

    exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

  - URL: '[% pc("glean", "var/glean_wheels_url") %]'

  - URL: '[% pc("glean-parser", "var/glean_wheels_url") %]'

    name: glean-wheels

    sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum") %]'

    sha256sum: '[% pc("glean-parser", "var/glean_wheels_sha256sum") %]'

  - project: oss-licenses-plugin

    name: oss-licenses-plugin

  - name: tor-expert-bundle-aar

projects/glean-parser/README.md

0 → 100644
+16 −0
Original line number Diff line number Diff line 
[Glean](https://docs.telemetry.mozilla.org/concepts/glean/glean.html) is Mozilla's

telemetry framework. Projects that use Glean define metrics in .yaml files, which

are then parsed by a python tool called `glean_parser` into whatever language the

project is using.



Mozilla supports offline builds, as long as you provide the wheels for `glean_parser`

and its dependencies.



Downloading wheels in a reproducible way isn't easy because locking dependencies is

optional in Python. Some Python package managers make it easy, but they don't offer

a way to just downloads the wheels for offline environments. So, our current solution

is to download the wheels once, and then package them in one of our servers, rather

than having users download the various wheel from PyPI or another mirror.



This project's goal is to unify the place where we define the URLs and hashes of

these archives.

projects/glean-parser/build

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#!/bin/bash



[% c("var/set_default_env") -%]

mkdir glean-wheels

cd glean-wheels

[% IF c("var/use_torsocks") %]torsocks [% END%]python3 -m pip download glean_parser==[% c("version") %]

# Get pyyaml, needed for building application-services

[% IF c("var/use_torsocks") %]torsocks [% END%]python3 -m pip download pyyaml==5.3.1

cd ..

[% c('tar', {

    tar_src => [ 'glean-wheels' ],

    tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'),

    }) %]

cd '[% dest_dir %]'

sha256sum [% c('filename') %]

echo 'The file is ready to be uploaded: out/glean-parser/[% c("filename") %]'