Merge branch 'release-v0.10.1' into release

Author: Dexterp37

.circleci/config.yml

@@ -18,10 +18,9 @@ jobs:
       - run:
           name: Run linter
           command: npm --prefix ./glean run lint
-      # Disabled because of bug 1704794.
-      # - run:
-      #    name: Run circular dependencies checker
-      #    command: npm --prefix ./glean run lint:circular-deps
+      - run:
+          name: Run circular dependencies checker
+          command: npm --prefix ./glean run lint:circular-deps
 
   unit-tests:
     docker:
@@ -78,22 +77,41 @@ jobs:
 
   check-qt-js:
     docker:
-      - image: circleci/python:latest
+      - image: cimg/python:3.9.4-node
     steps:
       - checkout
       - run:
           name: Install Javascript dependencies and build Glean.js for Qt
           command: |
-            # We are on the CircleCI python docker image, so let's install npm and node.
-            curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.0/install.sh | bash
-            export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-            nvm install node
             npm --prefix ./glean install
             npm --prefix ./glean run build:qt
       - run:
-          name: Verify no Javascript errors found in Qt
-          command: bin/qt-js-check.sh
+          name: Setup Qt dependency
+          command: |
+            # The following commands are copied from the VPN Qt setup for Linux
+            # See: https://github.com/mozilla-mobile/mozilla-vpn-client/blob/main/.github/workflows/linux.yaml#L18-L21
+            #
+            # Add external PPA, latest version of QT is 5.12.x for Ubuntu 20.04
+            sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
+            sudo apt update
+            sudo apt install git qt515tools qt515svg qt515networkauth-no-lgpl qt515charts-no-lgpl libgl-dev libpolkit-gobject-1-dev devscripts debhelper cdbs quilt qt515graphicaleffects qt515imageformats  qt515quickcontrols2   libxcb-image0-dev libxcb-shape0-dev libxcb-sync0-dev libxcb-render-util0-dev libxcb-xfixes0-dev libxcb-icccm4-dev libx11-xcb-dev libxcb-keysyms1-dev libasound2-dev libaudio-dev libcups2-dev libdbus-1-dev libglu1-mesa-dev  libmng-dev libtiff5-dev libxcursor-dev libxi-dev libxinerama-dev libxmu-dev libxrandr-dev libxv-dev libedit-dev libvulkan-dev qt515websockets -y
+      - run:
+          name: Run the Qt sample app and check for errors
+          command: |
+            cd samples/qt-qml-app
+            python3 -m venv venv
+            source venv/bin/activate
+            pip install -r requirements.txt
+
+            sudo apt-get install xvfb
+            xvfb-run python main.py &> qml.log &
+            # Wait for app to start
+            sleep 10
+            if ! grep -q "Initialized Glean succesfully." "qml.log"; then
+              echo "\n\n\033[1;91m** Failed to initialize Glean in Qt! See more logs below. **\033[0m\n\n"
+              cat qml.log
+              exit 1
+            fi
 
   publish:
     docker:

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean.js/compare/v0.10.0...main)
+[Full changelog](https://github.com/mozilla/glean.js/compare/v0.10.1...main)
+
+# v0.10.1 (2021-04-26)
+
+[Full changelog](https://github.com/mozilla/glean.js/compare/v0.10.0...v0.10.1)
+
+* [#254](https://github.com/mozilla/glean.js/pull/254): BUGFIX: Allow the usage of the Glean specific metrics API before Glean is initialized.
 
 # v0.10.0 (2021-04-20)
 

bin/qt-js-check.sh

@@ -1,5 +1,5 @@
 {
-  "tsConfig": "tsConfig/base.json",
+  "tsConfig": "tsconfig/base.json",
   "detectiveOptions": {
     "ts": {
       "skipTypeImports": true