Skip to content

Commit b4fd547

Browse files
committed
Merge branch 'release-v52.1.0' into release
2 parents ab11824 + ffa9cc9 commit b4fd547

File tree

72 files changed

+1372
-1338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1372
-1338
lines changed

.buildconfig.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libraryVersion: 52.0.1
1+
libraryVersion: 52.1.0
22
groupId: org.mozilla.telemetry
33
projects:
44
glean:

.circleci/config.yml

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ commands:
3939
- run:
4040
name: Turn on RUST_BACKTRACE and RUST_LOG for any job that installs rustc
4141
command: |
42-
echo "export RUST_BACKTRACE=1" >> $BASH_ENV
43-
echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV
42+
echo "export RUST_BACKTRACE=1" >> $BASH_ENV
43+
echo "export RUST_LOG=glean_core=debug" >> $BASH_ENV
4444
- run:
4545
name: Setup Rust toolchain
4646
command: |
@@ -91,16 +91,16 @@ commands:
9191
- run:
9292
name: Setup custom environment variables
9393
command: |
94-
echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV
94+
echo 'export PATH=$HOME/.cargo/bin:$PATH' >> $BASH_ENV
9595
9696
install-android-ndk:
9797
steps:
9898
- run:
9999
name: Install missing Android SDK & NDK
100100
command: |
101-
sdkmanager \
102-
"build-tools;33.0.0" \
103-
"ndk;25.1.8937393"
101+
sdkmanager \
102+
"build-tools;33.0.0" \
103+
"ndk;25.1.8937393"
104104
105105
android-setup:
106106
steps:
@@ -111,7 +111,7 @@ commands:
111111
- run:
112112
name: Restrict to Linux builds only
113113
command: |
114-
echo "rust.targets=linux-x86-64" > local.properties
114+
echo "rust.targets=linux-x86-64" > local.properties
115115
116116
test-python:
117117
steps:
@@ -120,8 +120,8 @@ commands:
120120
- run:
121121
name: Remove coredump file restriction
122122
command: |
123-
# tell the operating system to remove the file size limit on core dump files
124-
ulimit -c unlimited
123+
# tell the operating system to remove the file size limit on core dump files
124+
ulimit -c unlimited
125125
- run:
126126
name: Python tests
127127
command: |
@@ -131,9 +131,9 @@ commands:
131131
name: Detect and gather coredump files
132132
when: always
133133
command: |
134-
mkdir -p ~/coredumps
135-
# Try to copy the core file(s). Don't fail if they don't exist.
136-
cp core.* ~/coredumps || true
134+
mkdir -p ~/coredumps
135+
# Try to copy the core file(s). Don't fail if they don't exist.
136+
cp core.* ~/coredumps || true
137137
- store_artifacts:
138138
path: ~/coredumps
139139
destination: coredumps
@@ -417,8 +417,8 @@ jobs:
417417
- run:
418418
name: Remove coredump file restriction
419419
command: |
420-
# tell the operating system to remove the file size limit on core dump files
421-
ulimit -c unlimited
420+
# tell the operating system to remove the file size limit on core dump files
421+
ulimit -c unlimited
422422
- run:
423423
name: Android tests
424424
command: ./gradlew --no-daemon :glean:testDebugUnitTest
@@ -428,22 +428,22 @@ jobs:
428428
- run:
429429
name: Save test results
430430
command: |
431-
mkdir -p ~/test-results/junit/
432-
mkdir -p ~/test-results/tests/
433-
cp -a glean-core/android/build/reports/tests ~/test-results/
434-
find glean-core/android/build -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
431+
mkdir -p ~/test-results/junit/
432+
mkdir -p ~/test-results/tests/
433+
cp -a glean-core/android/build/reports/tests ~/test-results/
434+
find glean-core/android/build -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
435435
when: always
436436
- store_artifacts:
437437
path: ~/test-results/tests
438438
destination: test-results
439439
- run:
440440
name: Detect and gather coredump files
441441
command: |
442-
mkdir -p ~/coredumps
443-
# Try to copy the core file from a default location. Don't fail if it doesn't exist.
444-
cp -a glean-core/android/core ~/coredumps || true
445-
# The JVM/Gradle might also produce a log file named like "hs_err_pid3247.log", let's copy that as well
446-
find . -type f -name "hs_*.log" | xargs -I% cp -a % ~/coredumps/%
442+
mkdir -p ~/coredumps
443+
# Try to copy the core file from a default location. Don't fail if it doesn't exist.
444+
cp -a glean-core/android/core ~/coredumps || true
445+
# The JVM/Gradle might also produce a log file named like "hs_err_pid3247.log", let's copy that as well
446+
find . -type f -name "hs_*.log" | xargs -I% cp -a % ~/coredumps/%
447447
- store_artifacts:
448448
path: ~/coredumps
449449
destination: coredumps
@@ -452,7 +452,7 @@ jobs:
452452
- run:
453453
name: Build Android Sample App
454454
command: |
455-
./gradlew :glean-sample-app:assembleAndroidTest
455+
./gradlew :glean-sample-app:assembleAndroidTest
456456
environment:
457457
GRADLE_OPTS: -Xmx2048m
458458
TARGET_CFLAGS: -DNDEBUG
@@ -612,7 +612,7 @@ jobs:
612612
- run:
613613
name: Build XCFramework archive
614614
command: |
615-
bash bin/build-xcframework.sh
615+
bash bin/build-xcframework.sh
616616
- run:
617617
name: Build sample app
618618
command: |
@@ -664,9 +664,9 @@ jobs:
664664
- run:
665665
name: Release glean-swift
666666
command: |
667-
git config --global user.email "[email protected]"
668-
git config --global user.name "Glean automated release"
669-
./bin/publish-glean-swift.sh "${CIRCLE_TAG}"
667+
git config --global user.email "[email protected]"
668+
git config --global user.name "Glean automated release"
669+
./bin/publish-glean-swift.sh "${CIRCLE_TAG}"
670670
671671
###########################################################################
672672
# Python
@@ -700,7 +700,7 @@ jobs:
700700
- skip-if-doc-only
701701
- run:
702702
command: |
703-
echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
703+
echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
704704
- test-python
705705

706706
Python 3_7 tests:
@@ -736,7 +736,7 @@ jobs:
736736
- skip-if-doc-only
737737
- run:
738738
command: |
739-
echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
739+
echo "export GLEAN_PYDEPS=min" >> $BASH_ENV
740740
- test-python
741741

742742
Python 3_9 on Alpine tests:
@@ -921,10 +921,11 @@ jobs:
921921
GLEAN_BUILD_VARIANT: release
922922
- run:
923923
name: Upload wheels to PyPI
924-
command:
924+
command: |
925+
cd glean-core/python
925926
# Requires that the TWINE_USERNAME and TWINE_PASSWORD environment
926927
# variables are configured in CircleCI's environment variables.
927-
.venv3.9/bin/python3 -m twine upload glean-core/python/dist/*
928+
.venv3.9/bin/python3 -m twine upload dist/*
928929
- install-ghr-darwin
929930
- run:
930931
name: Publish to Github

.dictionary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 253 utf-8
1+
personal_ws-1.1 en 254 utf-8
22
AAR
33
AARs
44
ABI

.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
[flake8]
22
max-line-length = 100
33
exclude = glean-core/python/glean/_uniffi.py
4+
# W503 - line break before binary operator - black formats it that way
5+
ignore = W503

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
# Unreleased changes
22

3-
[Full changelog](https://github.com/mozilla/glean/compare/v52.0.1...main)
3+
[Full changelog](https://github.com/mozilla/glean/compare/v52.1.0...main)
4+
5+
# v52.1.0 (2023-01-26)
6+
7+
[Full changelog](https://github.com/mozilla/glean/compare/v52.0.1...v52.1.0)
8+
9+
* General
10+
* BUGFIX: Custom Pings with events should no longer erroneously post `InvalidState` errors ([bug 1811872](https://bugzilla.mozilla.org/show_bug.cgi?id=1811872))
11+
* Upgrade to `glean_parser` v7.0.0 ([#2346](https://github.com/mozilla/glean/pull/2346))
12+
* Kotlin
13+
* Update to Gradle v7.6 ([#2317](https://github.com/mozilla/glean/pull/2317))
14+
* Rust
15+
* Added a new `client_info` field `windows_build_number` (Windows only) ([#2325](https://github.com/mozilla/glean/pull/2325))
16+
* A new `ConfigurationBuilder` allows to create the Glean configuration before initialization ([#2313](https://github.com/mozilla/glean/pull/2313))
17+
* Drop dependency on `env_logger` for regular builds ([#2312](https://github.com/mozilla/glean/pull/2312))
418

519
# v52.0.1 (2023-01-19)
620

0 commit comments

Comments
 (0)