Merge branch 'release-v50.1.0' into release

mozilla · Jun 15, 2022 · 77df3bf · 77df3bf
2 parents f6ecdfd + 14dbc6f
commit 77df3bf
Show file tree

Hide file tree

Showing 91 changed files with 1,774 additions and 1,984 deletions.
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 50.0.1
+libraryVersion: 50.1.0
 groupId: org.mozilla.telemetry
 projects:
   glean:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -60,12 +60,14 @@ commands:
           rust-version: <<parameters.rust-version>>
       - run:
           name: Test
-          command: GLEAN_TEST_COVERAGE=$(realpath glean_coverage.txt) cargo test --all --verbose -- --nocapture
+          command: |
+            export GLEAN_TEST_COVERAGE=$(realpath glean_coverage.txt)
+            cargo test --all --verbose --jobs 6 -- --nocapture
       - run:
           name: Test Glean with rkv safe-mode
           command: |
             cd glean-core
-            cargo test -p glean-core --features rkv-safe-mode -- --nocapture
+            cargo test -p glean-core --features rkv-safe-mode --jobs 6 -- --nocapture
       - run:
           name: Upload coverage report
           command: |
@@ -234,7 +236,7 @@ jobs:
 
   License check:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - run:
@@ -254,7 +256,7 @@ jobs:
 
   Check vendored schema:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - run:
@@ -284,7 +286,7 @@ jobs:
 
   Check Rust formatting:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - run: rustup component add rustfmt
@@ -293,7 +295,7 @@ jobs:
 
   Lint Rust with clippy:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - run: rustup component add clippy
@@ -304,15 +306,14 @@ jobs:
 
   Rust tests - stable:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     resource_class: "medium+"
     steps:
-      - test-rust:
-          rust-version: "1.60.0"
+      - test-rust
 
   Rust tests - beta:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - test-rust:
           rust-version: "beta"
@@ -327,7 +328,7 @@ jobs:
 
   Generate Rust documentation:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - run:
@@ -359,7 +360,7 @@ jobs:
 
   Publish Rust crates:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - run:
@@ -490,9 +491,6 @@ jobs:
           command: |
             rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
 
-            # Bootstrap dependencies
-            bin/bootstrap.sh
-
             UDID=$(xcrun xctrace list devices 2>&1 | grep 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
             xcrun simctl boot "$UDID"
             # Store build type for use in cache key
@@ -580,38 +578,9 @@ jobs:
             UDID=$(echo "$DEVICES" | grep 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
             xcrun simctl boot "$UDID"
       - run:
-          name: Reduce dependencies in Cartfile for caching
-          command: |
-            sed -i.bak "/mozilla\/glean/d" "samples/ios/app/Cartfile"
-      - restore_cache:
-          name: Restore carthage dep cache
-          key: v1-swift-sample-deps-{{checksum "samples/ios/app/Cartfile"}}
-      - run:
-          name: Bootstrap dependencies
-          command: |
-            pushd samples/ios/app
-            ./bootstrap.sh
-            popd
-      - save_cache:
-          paths:
-            - samples/ios/app/Carthage
-          key: v1-swift-sample-deps-{{checksum "samples/ios/app/Cartfile"}}
-      - run:
-          name: Use current commit of Glean
-          command: |
-            GLEAN_PATH="$(pwd)"
-            CARTFILE_PATH="${GLEAN_PATH}/samples/ios/app/Cartfile"
-
-            echo "New Cartfile:"
-            echo "git \"${GLEAN_PATH}\" \"${CIRCLE_SHA1}\"#" >> "$CARTFILE_PATH"
-            cat "${CARTFILE_PATH}"
-      - run:
-          name: Bootstrap Glean dependency
+          name: Build XCFramework archive
           command: |
-            pushd samples/ios/app
-            carthage update --no-build --verbose
-            ./bootstrap.sh
-            popd
+              bash bin/build-xcframework.sh
       - run:
           name: Build sample app
           command: |
@@ -655,7 +624,7 @@ jobs:
 
   glean-swift release:
     docker:
-      - image: cimg/rust:1.60
+      - image: cimg/rust:1.61
     steps:
       - checkout
       - attach_workspace:
@@ -761,15 +730,15 @@ jobs:
 
   Python Windows x86_64 tests:
     docker:
-      - image: cimg/python:3.8.5
+      - image: cimg/python:3.8
     steps:
       - checkout
       - skip-if-doc-only
       - build-windows-x86_64-wheel
       - run:
           name: Install Wine
           command: |
-            sudo apt install wine-stable
+            sudo apt install wine64
       - run:
           name: Install Python for Windows
           command: |
@@ -781,11 +750,11 @@ jobs:
       - run:
           name: Run tests
           command: |
-            $WINPYTHON -m pytest glean-core/python/tests
+            $WINPYTHON -m pytest -s glean-core/python/tests
 
   Python Windows i686 tests:
     docker:
-      - image: cimg/python:3.8.5
+      - image: cimg/python:3.8
     steps:
       - checkout
       - skip-if-doc-only
@@ -807,7 +776,7 @@ jobs:
       - run:
           name: Run tests
           command: |
-            $WINPYTHON -m pytest glean-core/python/tests
+            $WINPYTHON -m pytest -s glean-core/python/tests
 
   Generate Python documentation:
     docker:
@@ -1070,11 +1039,6 @@ jobs:
 
 workflows:
   version: 2
-  check-formating:
-    jobs:
-      - Check Rust formatting
-      - Check Swift formatting
-
   lint:
     jobs:
       - Lint YAML with yamllint
@@ -1084,6 +1048,8 @@ workflows:
       - Lint Android with ktlint and detekt
       - Lint Python
       - Check vendored schema
+      - Check Rust formatting
+      - Check Swift formatting
 
   ci:
     jobs:

diff --git a/.dictionary b/.dictionary
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 248 utf-8
+personal_ws-1.1 en 250 utf-8
 AAR
 AARs
 ABI
@@ -92,6 +92,7 @@ Uploaders
 Wasm
 WebRender
 Webpack
+XCFramework
 Xcode
 YAML
 aarch

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This CODEOWNERS file defines individuals or teams that are responsible
+# for code in this repository.
+# See https://help.github.com/articles/about-codeowners/ for details.
+
+* @mozilla/glean
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
diff --git a/.gitignore b/.gitignore
@@ -23,10 +23,6 @@ raw_xcode*log
 /glean-core/ios/Pipfile.lock
 /glean-core/ios/.venv
 
-# Carthage build artifacts
-Cartfile.resolved
-Carthage
-
 # OS stuff
 .DS_Store
 *.dSYM
@@ -35,29 +31,6 @@ Carthage
 *.egg-info
 dist/
 
-# C# stuff
-*.suo
-*.user
-*.pubxml
-/glean-core/csharp/*/bin/
-/glean-core/csharp/*/obj/
-/glean-core/csharp/.vs/
-# The 'build' dir is generally disallowed,
-# but we need to allow it here to enable our
-# csharp custom task.
-!/glean-core/csharp/Glean/build/
-/glean-core/csharp/Glean/.venv/
-/samples/csharp/bin/
-/samples/csharp/obj/
-/samples/csharp/.vs/
-/samples/csharp/.venv/
-
-# local stuff
-/data/
-glean-core/data
-glean_app*
-!glean_app.c
-
 samples/ios/app/.venv/
 .mypy_cache/
 .coverage

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v50.0.1...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v50.1.0...main)
+
+# v50.1.0 (2022-06-15)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v50.0.1...v50.1.0)
+
+* General
+  * Updated to `glean_parser` v6.1.1 ([#2092](https://github.com/mozilla/glean/pull/2092))
+* Swift
+  * Dropped usage of Carthage for internal dependencies ([#2089](https://github.com/mozilla/glean/pull/2089))
+  * Implement the text metric ([#2073](https://github.com/mozilla/glean/pull/2073))
+* Kotlin
+  * Implement the text metric ([#2073](https://github.com/mozilla/glean/pull/2073))
+* Rust
+  * Derive `serde::{Deserialize, Serialize}` on `Lifetime` and `CommonMetricData` ([bug 1772156](https://bugzilla.mozilla.org/show_bug.cgi?id=1772156))
 
 # v50.0.1 (2022-05-25)