Skip to content

Commit

Permalink
No ticket - Point glean submodule to release branch (#5201)
Browse files Browse the repository at this point in the history
* Point glean submodule to release branch

* Fix linux script git fetch

* Add new required property to Glean init

* Attempt to get CI unstuck
  • Loading branch information
brizental authored and bakulf committed Dec 13, 2022
1 parent 28661a7 commit a01921a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
[submodule "3rdparty/glean"]
path = 3rdparty/glean
url = https://github.com/mozilla/glean.git
branch = main
branch = release
2 changes: 1 addition & 1 deletion 3rdparty/glean
Submodule glean updated 161 files
2 changes: 1 addition & 1 deletion scripts/linux/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ print Y "Update the submodules..."
git submodule init || die "Failed"
git submodule update --remote --depth 1 i18n || die "Failed"
git submodule update --remote --depth 1 3rdparty/wireguard-tools || die "Failed"
git submodule update --remote --depth 1 3rdparty/glean || die "Failed"
git submodule update --depth 1 3rdparty/glean || die "Failed"
print G "done."

print G "Creating the orig tarball"
Expand Down
1 change: 1 addition & 0 deletions vpnglean/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ pub extern "C" fn glean_initialize(is_telemetry_enabled: bool, data_path: FfiStr
uploader: Some(Box::new(VPNPingUploader::new())),
// Whether Glean should schedule “metrics” pings for you
use_core_mps: true,
trim_data_to_registered_pings: false,
};

let client_info = ClientInfoMetrics {
Expand Down

0 comments on commit a01921a

Please sign in to comment.