Skip to content

Commit

Permalink
Bug 1892230 - Update to Glean v60.0.1 r=TravisLong,supply-chain-revie…
Browse files Browse the repository at this point in the history
…wers,mach-reviewers,android-reviewers a=pascalc

Backported for beta.

Differential Revision: https://phabricator.services.mozilla.com/D212286
  • Loading branch information
badboy committed Jun 3, 2024
1 parent b47c14a commit b002e56
Show file tree
Hide file tree
Showing 18 changed files with 100 additions and 173 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions gfx/wr/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gfx/wr/webrender/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ svg_fmt = "0.4"
tracy-rs = "0.1.2"
derive_more = { version = "0.99", default-features = false, features = ["add_assign"] }
etagere = "0.2.6"
glean = { version = "60.0.0", optional = true }
glean = { version = "60.0.1", optional = true }
firefox-on-glean = { version = "0.1.0", optional = true }
swgl = { path = "../swgl", optional = true }
topological-sort = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion gfx/wr/wr_glyph_rasterizer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tracy-rs = "0.1.2"
log = "0.4"
lazy_static = "1"
fxhash = "0.2.1"
glean = { version = "60.0.0", optional = true }
glean = { version = "60.0.1", optional = true }
firefox-on-glean = { version = "0.1.0", optional = true }
serde = { optional = true, version = "1.0", features = ["serde_derive"] }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ object Versions {
const val serialization = "1.6.3"
const val python_envs_plugin = "0.0.31"

const val mozilla_glean = "60.0.0"
const val mozilla_glean = "60.0.1"

const val junit = "4.13.2"
const val robolectric = "4.12.1"
Expand Down
2 changes: 1 addition & 1 deletion python/sites/mach.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ vendored:third_party/python/wheel
vendored:third_party/python/zipp
# glean-sdk may not be installable if a wheel isn't available
# and it has to be built from source.
pypi-optional:glean-sdk==60.0.0:telemetry will not be collected
pypi-optional:glean-sdk==60.0.1:telemetry will not be collected
# Mach gracefully handles the case where `psutil` is unavailable.
# We aren't (yet) able to pin packages in automation, so we have to
# support down to the oldest locally-installed version (5.4.2).
Expand Down
12 changes: 0 additions & 12 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,6 @@ criteria = "safe-to-deploy"
version = "1.3.3"
criteria = "safe-to-deploy"

[[exemptions.bitflags]]
version = "1.3.2"
criteria = "safe-to-deploy"

[[exemptions.bitreader]]
version = "0.3.6"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -616,10 +612,6 @@ criteria = "safe-to-deploy"
version = "0.2.7"
criteria = "safe-to-deploy"

[[exemptions.objc_exception]]
version = "0.1.2"
criteria = "safe-to-deploy"

[[exemptions.object]]
version = "0.28.4"
criteria = "safe-to-deploy"
Expand All @@ -628,10 +620,6 @@ criteria = "safe-to-deploy"
version = "1.12.0"
criteria = "safe-to-deploy"

[[exemptions.packed_simd]]
version = "0.3.8"
criteria = "safe-to-deploy"

[[exemptions.phf]]
version = "0.10.1"
criteria = "safe-to-deploy"
Expand Down
142 changes: 4 additions & 138 deletions supply-chain/imports.lock
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@ user-id = 696
user-login = "fitzgen"
user-name = "Nick Fitzgerald"

[[publisher.byteorder]]
version = "1.4.3"
when = "2021-03-10"
user-id = 189
user-login = "BurntSushi"
user-name = "Andrew Gallant"

[[publisher.byteorder]]
version = "1.5.0"
when = "2023-10-06"
Expand Down Expand Up @@ -134,13 +127,6 @@ user-id = 5946
user-login = "jrmuizel"
user-name = "Jeff Muizelaar"

[[publisher.core-foundation-sys]]
version = "0.8.3"
when = "2021-10-12"
user-id = 2396
user-login = "jdm"
user-name = "Josh Matthews"

[[publisher.core-foundation-sys]]
version = "0.8.4"
when = "2023-04-03"
Expand Down Expand Up @@ -190,13 +176,6 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.encoding_rs]]
version = "0.8.33"
when = "2023-08-23"
user-id = 4484
user-login = "hsivonen"
user-name = "Henri Sivonen"

[[publisher.encoding_rs]]
version = "0.8.34"
when = "2024-04-10"
Expand Down Expand Up @@ -247,15 +226,15 @@ user-login = "jrmuizel"
user-name = "Jeff Muizelaar"

[[publisher.glean]]
version = "60.0.0"
when = "2024-04-22"
version = "60.0.1"
when = "2024-05-31"
user-id = 48
user-login = "badboy"
user-name = "Jan-Erik Rediger"

[[publisher.glean-core]]
version = "60.0.0"
when = "2024-04-22"
version = "60.0.1"
when = "2024-05-31"
user-id = 48
user-login = "badboy"
user-name = "Jan-Erik Rediger"
Expand All @@ -274,13 +253,6 @@ user-id = 359
user-login = "seanmonstar"
user-name = "Sean McArthur"

[[publisher.hashbrown]]
version = "0.14.3"
when = "2023-11-26"
user-id = 2915
user-login = "Amanieu"
user-name = "Amanieu d'Antras"

[[publisher.hashbrown]]
version = "0.14.5"
when = "2024-04-28"
Expand All @@ -302,13 +274,6 @@ user-id = 359
user-login = "seanmonstar"
user-name = "Sean McArthur"

[[publisher.indexmap]]
version = "1.9.3"
when = "2023-03-24"
user-id = 539
user-login = "cuviper"
user-name = "Josh Stone"

[[publisher.indexmap]]
version = "2.2.6"
when = "2024-03-23"
Expand Down Expand Up @@ -344,13 +309,6 @@ user-id = 1
user-login = "alexcrichton"
user-name = "Alex Crichton"

[[publisher.libc]]
version = "0.2.152"
when = "2024-01-07"
user-id = 51017
user-login = "JohnTitor"
user-name = "Yuki Okushi"

[[publisher.libc]]
version = "0.2.153"
when = "2024-01-31"
Expand Down Expand Up @@ -455,12 +413,6 @@ when = "2022-10-16"
user-id = 52553
user-login = "embark-studios"

[[publisher.prio]]
version = "0.15.3"
when = "2023-10-03"
user-id = 213776
user-login = "divviup-github-automation"

[[publisher.prio]]
version = "0.16.2"
when = "2024-03-19"
Expand Down Expand Up @@ -544,13 +496,6 @@ user-id = 2915
user-login = "Amanieu"
user-name = "Amanieu d'Antras"

[[publisher.serde]]
version = "1.0.197"
when = "2024-02-20"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde]]
version = "1.0.198"
when = "2024-04-16"
Expand All @@ -565,27 +510,13 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_derive]]
version = "1.0.197"
when = "2024-02-20"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_derive]]
version = "1.0.198"
when = "2024-04-16"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_json]]
version = "1.0.93"
when = "2023-02-08"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_json]]
version = "1.0.116"
when = "2024-04-16"
Expand Down Expand Up @@ -628,27 +559,13 @@ user-id = 189
user-login = "BurntSushi"
user-name = "Andrew Gallant"

[[publisher.thiserror]]
version = "1.0.57"
when = "2024-02-11"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.thiserror]]
version = "1.0.59"
when = "2024-04-20"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.thiserror-impl]]
version = "1.0.57"
when = "2024-02-11"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.thiserror-impl]]
version = "1.0.59"
when = "2024-04-20"
Expand Down Expand Up @@ -789,36 +706,18 @@ user-id = 1
user-login = "alexcrichton"
user-name = "Alex Crichton"

[[publisher.wasm-encoder]]
version = "0.201.0"
when = "2024-02-27"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wasm-encoder]]
version = "0.205.0"
when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wasm-smith]]
version = "0.201.0"
when = "2024-02-27"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wasm-smith]]
version = "0.205.0"
when = "2024-04-18"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wast]]
version = "201.0.0"
when = "2024-02-27"
user-id = 73222
user-login = "wasmtime-publish"

[[publisher.wast]]
version = "205.0.0"
when = "2024-04-18"
Expand Down Expand Up @@ -933,25 +832,6 @@ criteria = "safe-to-deploy"
version = "0.21.0"
notes = "This crate has no dependencies, no build.rs, and contains no unsafe code."

[[audits.bytecode-alliance.audits.bitflags]]
who = "Jamey Sharp <[email protected]>"
criteria = "safe-to-deploy"
delta = "2.1.0 -> 2.2.1"
notes = """
This version adds unsafe impls of traits from the bytemuck crate when built
with that library enabled, but I believe the impls satisfy the documented
safety requirements for bytemuck. The other changes are minor.
"""

[[audits.bytecode-alliance.audits.bitflags]]
who = "Alex Crichton <[email protected]>"
criteria = "safe-to-deploy"
delta = "2.3.2 -> 2.3.3"
notes = """
Nothing outside the realm of what one would expect from a bitflags generator,
all as expected.
"""

[[audits.bytecode-alliance.audits.block-buffer]]
who = "Benjamin Bouvier <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1691,13 +1571,6 @@ version = "0.1.2"
notes = "TOML parser, forked from toml 0.5"
aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"

[[audits.mozilla.audits.bitflags]]
who = "Jan-Erik Rediger <[email protected]>"
criteria = "safe-to-deploy"
delta = "2.4.0 -> 2.4.1"
notes = "Only allowing new clippy lints"
aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"

[[audits.mozilla.audits.either]]
who = "Nika Layzell <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -1708,13 +1581,6 @@ no unsafe code.
"""
aggregated-from = "https://raw.githubusercontent.com/mozilla/cargo-vet/main/supply-chain/audits.toml"

[[audits.mozilla.audits.goblin]]
who = "Alex Franchuk <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.7.1 -> 0.8.0"
notes = "Fairly straightforward feature improvements."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"

[[audits.mozilla.audits.lazy_static]]
who = "Nika Layzell <[email protected]>"
criteria = "safe-to-deploy"
Expand Down
2 changes: 1 addition & 1 deletion third_party/rust/glean-core/.cargo-checksum.json

Large diffs are not rendered by default.

Loading

0 comments on commit b002e56

Please sign in to comment.