Merge branch 'release-v0.15.0' into release

Author: brizental

.circleci/config.yml

@@ -70,17 +70,34 @@ jobs:
               npm --prefix ./glean run build:webext
               npm --prefix ./glean run build:cli
               npm --prefix ./glean link
+      # JS sample related jobs
       - run:
           name: Install Javascript dependencies for the JS sample
           command: |
               npm --prefix ./samples/web-extension/javascript install
               npm --prefix ./samples/web-extension/javascript link @mozilla/glean
       - run:
           name: Build the JS sample
-          command: npm --prefix ./samples/web-extension/javascript run build
+          command: |
+            npm --prefix ./samples/web-extension/javascript run build
+      - run:
+          name: Run JS sample test
+          command: |
+            export PATH=.:$PATH && npm --prefix ./samples/web-extension/javascript run test
+      # TS sample related jobs
+      - run:
+          name: Install Typescript dependencies for the TS sample
+          command: |
+              npm --prefix ./samples/web-extension/typescript install
+              npm --prefix ./samples/web-extension/typescript link @mozilla/glean
+      - run:
+          name: Build the TS sample
+          command: |
+            npm --prefix ./samples/web-extension/typescript run build
       - run:
-          name: Run samples tests
-          command: export PATH=.:$PATH && npm --prefix ./samples/web-extension/javascript run test
+          name: Run TS sample test
+          command: |
+            export PATH=.:$PATH && npm --prefix ./samples/web-extension/typescript run test
 
   check-size:
     docker:
@@ -118,7 +135,8 @@ jobs:
             python3 -m venv venv
             source venv/bin/activate
             pip install -r requirements.txt
-            glean_parser translate metrics.yaml pings.yaml -f javascript -o generated --option platform=qt
+            glean_parser translate metrics.yaml pings.yaml -f javascript -o generated \
+            --option platform=qt --option version="0.15";
 
             sudo apt-get install xvfb
             xvfb-run python main.py &> qml.log &
@@ -191,8 +209,8 @@ jobs:
             # Attach Qt build to release
             npm --prefix ./glean install
             npm --prefix ./glean run build:qt
-            cp glean/dist/glean.js glean/dist/glean_js-${CIRCLE_TAG}-qt.js
-            ./ghr -u mozilla -replace ${CIRCLE_TAG} glean/dist/glean_js-${CIRCLE_TAG}-qt.js
+            tar -zcvf "glean/dist/glean_js-${CIRCLE_TAG}-qt.tar.gz" glean/dist/qt
+            ./ghr -u mozilla -replace ${CIRCLE_TAG} glean/dist/glean_js-${CIRCLE_TAG}-qt.tar.gz
 
 workflows:
   version: 2

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean.js/compare/v0.14.1...main)
+[Full changelog](https://github.com/mozilla/glean.js/compare/v0.15.0...main)
+
+# v0.15.0 (2021-06-03)
+
+[Full changelog](https://github.com/mozilla/glean.js/compare/v0.14.1...v0.15.0)
+
+* [#389](https://github.com/mozilla/glean.js/pull/389): BUGFIX: Make sure to submit a `deletion-request` ping before clearing data when toggling upload.
+* [#375](https://github.com/mozilla/glean.js/pull/375): Release Glean.js for Qt as a QML module.
 
 # v0.14.1 (2021-05-21)
 

bin/prepare-qml-module.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# 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/.
+
+set -eo pipefail
+
+WORKSPACE_ROOT="$( cd "$(dirname "$0")/.." ; pwd -P )"
+
+# Get @mozilla/glean current version without the patch version.
+# Qt import paths may only have major and minor version.
+GLEAN_VERSION=$(node -p -e "require('${WORKSPACE_ROOT}/glean/package.json').version.split('.').reverse().slice(1).reverse().join('.')")
+
+# Create the qmldir file
+FILE=glean/dist/qt/org/mozilla/Glean/qmldir
+touch "${WORKSPACE_ROOT}/${FILE}"
+{
+    echo module org.mozilla.Glean
+    echo Glean $GLEAN_VERSION glean.js
+} >> "${WORKSPACE_ROOT}/${FILE}"
+
+# Add the glean.js file to the final module
+cp "${WORKSPACE_ROOT}/glean/src/index/qt.js" "${WORKSPACE_ROOT}/glean/dist/qt/org/mozilla/Glean/glean.js"

bin/prepare-release.sh

@@ -113,6 +113,32 @@ run $SED -i.bak -E \
     "${WORKSPACE_ROOT}/${FILE}"
 run rm "${WORKSPACE_ROOT}/${FILE}.bak"
 
+### Qt sample app ###
+# Qt changes are necessary because QML requires that you add
+# version number along with the import statements.
+
+# This gets the version string without the patch version.
+GLEAN_VERSION_FOR_QML=$(node -p -e "'${NEW_VERSION}'.split('.').reverse().slice(1).reverse().join('.')")
+
+FILE=samples/qt-qml-app/main.qml
+run $SED -i.bak -E \
+    -e "s/import org.mozilla.Glean [0-9a-z.-]+/import org.mozilla.Glean ${GLEAN_VERSION_FOR_QML};/" \
+    -e "s/import generated [0-9a-z.-]+/import generated ${GLEAN_VERSION_FOR_QML};/" \
+    "${WORKSPACE_ROOT}/${FILE}"
+run rm "${WORKSPACE_ROOT}/${FILE}.bak"
+
+FILE=samples/qt-qml-app/README.md
+run $SED -i.bak -E \
+    -e "s/--option platform=qt --option version=[0-9a-z.-]+/--option platform=qt --option version=\"${GLEAN_VERSION_FOR_QML}\";/" \
+    "${WORKSPACE_ROOT}/${FILE}"
+run rm "${WORKSPACE_ROOT}/${FILE}.bak"
+
+FILE=.circleci/config.yml
+run $SED -i.bak -E \
+    -e "s/--option platform=qt --option version=[0-9a-z.-]+/--option platform=qt --option version=\"${GLEAN_VERSION_FOR_QML}\";/" \
+    "${WORKSPACE_ROOT}/${FILE}"
+run rm "${WORKSPACE_ROOT}/${FILE}.bak"
+
 echo "Everything prepared for v${NEW_VERSION}"
 echo
 echo "Changed files:"

docs/troubleshooting.md

@@ -1,3 +1,4 @@
 dist
 venv
 node_modules
+qt.js