Skip to content

Commit

Permalink
Merge branch 'release-v52.2.0' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
badboy committed Jan 30, 2023
2 parents 2106e72 + 5846157 commit 8a8da0e
Show file tree
Hide file tree
Showing 16 changed files with 492 additions and 446 deletions.
2 changes: 1 addition & 1 deletion .buildconfig.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libraryVersion: 52.1.1
libraryVersion: 52.2.0
groupId: org.mozilla.telemetry
projects:
glean:
Expand Down
47 changes: 22 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,11 @@ commands:
sudo apt update
sudo apt install --yes --no-install-recommends \
python3-pip \
python3.8-venv
python3.10-venv
- run:
name: Run Rust sample
command: |
if rustc --version | grep -q 'rustc 1.6'; then
cargo run -p sample
fi
cargo run -p sample
- run:
name: Upload coverage report
command: |
Expand Down Expand Up @@ -159,8 +157,7 @@ commands:
build-windows-i686-wheel:
steps:
- install-rustup
- setup-rust-toolchain:
rust-version: "1.58.0"
- setup-rust-toolchain
- install-mingw
- run:
name: Install Python development tools for host
Expand Down Expand Up @@ -244,7 +241,7 @@ jobs:

License check:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- run:
Expand All @@ -264,7 +261,7 @@ jobs:

Check vendored schema:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- run:
Expand Down Expand Up @@ -294,7 +291,7 @@ jobs:

Check Rust formatting:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- run: rustup component add rustfmt
Expand All @@ -303,7 +300,7 @@ jobs:

Lint Rust with clippy:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- run: rustup component add clippy
Expand All @@ -313,36 +310,36 @@ jobs:
command: |
sudo apt update
sudo apt install --yes --no-install-recommends \
python3.8-venv
python3.10-venv
- run:
name: Clippy
command: make lint-rust

Rust tests - stable:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
resource_class: "medium+"
steps:
- test-rust

Rust tests - beta:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- test-rust:
rust-version: "beta"

Rust tests - minimum version:
docker:
- image: cimg/rust:1.58
- image: cimg/rust:1.67
resource_class: "medium+"
steps:
- test-rust:
rust-version: "1.58.0"
rust-version: "1.60.0"

Generate Rust documentation:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- run:
Expand Down Expand Up @@ -374,7 +371,7 @@ jobs:

Publish Rust crates:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- run:
Expand Down Expand Up @@ -656,7 +653,7 @@ jobs:
glean-swift release:
docker:
- image: cimg/rust:1.61
- image: cimg/rust:1.67
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -717,9 +714,6 @@ jobs:
steps:
- checkout
- test-python
- persist_to_workspace:
root: glean-core/python/
paths: .venv3.8

Python 3_9 tests:
docker:
Expand Down Expand Up @@ -759,6 +753,9 @@ jobs:
steps:
- checkout
- test-python
- persist_to_workspace:
root: glean-core/python/
paths: .venv3.10

Python Windows x86_64 tests:
docker:
Expand Down Expand Up @@ -812,14 +809,14 @@ jobs:
Generate Python documentation:
docker:
- image: cimg/python:3.8
- image: cimg/python:3.10
steps:
- checkout
- attach_workspace:
at: glean-core/python/
- run:
name: Generate Python docs
command: glean-core/python/.venv3.8/bin/python3 -m pdoc --html glean --force -o build/docs/python
command: glean-core/python/.venv3.10/bin/python3 -m pdoc --html glean --force -o build/docs/python
- persist_to_workspace:
root: build/
paths: docs/python
Expand Down Expand Up @@ -978,7 +975,7 @@ jobs:

Docs internal metrics check:
docker:
- image: cimg/python:3.8
- image: cimg/python:3.10
steps:
- checkout
- run:
Expand Down Expand Up @@ -1101,7 +1098,7 @@ workflows:
- docs-spellcheck
- Generate Python documentation:
requires:
- Python 3_8 tests
- Python 3_10 tests
- docs-linkcheck:
requires:
- Generate Rust documentation
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
# Unreleased changes

[Full changelog](https://github.com/mozilla/glean/compare/v52.1.1...main)
[Full changelog](https://github.com/mozilla/glean/compare/v52.2.0...main)

# v52.2.0 (2023-01-30)

[Full changelog](https://github.com/mozilla/glean/compare/v52.1.1...v52.2.0)

* General
* Update to UniFFI 0.23 ([#2338](https://github.com/mozilla/glean/pull/2338))

# v52.1.1 (2023-01-26)

[Full changelog](https://github.com/mozilla/glean/compare/v52.1.0...v52.1.1)

* General
* BUGFIX: Properly invoke the windows build number function from whatsys ([bug 1812672](https://bugzilla.mozilla.org/show_bug.cgi?id=1812672))
* BUGFIX: Properly invoke the windows build number function from whatsys ([bug 1812672](https://bugzilla.mozilla.org/show_bug.cgi?id=1812672))

# v52.1.0 (2023-01-26)

Expand Down
62 changes: 36 additions & 26 deletions Cargo.lock

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

Loading

0 comments on commit 8a8da0e

Please sign in to comment.