Skip to content

Commit d8b55a0

Browse files
committed
Merge branch 'release-v1.4.0' into release
2 parents 089e0a5 + 3839eca commit d8b55a0

File tree

24 files changed

+6695
-7431
lines changed

24 files changed

+6695
-7431
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
pip install -r requirements.txt
180180
glean_parser translate src/App/metrics.yaml src/App/pings.yaml \
181181
-f javascript -o src/App/generated \
182-
--option platform=qt --option version="1.3"
182+
--option platform=qt --option version="1.4"
183183
- run:
184184
name: Run Qt sample tests
185185
command: |
@@ -219,6 +219,9 @@ jobs:
219219
steps:
220220
- checkout
221221
- install-node
222+
- add_ssh_keys:
223+
fingerprints:
224+
- "ea:d2:3c:e1:09:cf:1a:1d:85:d6:6e:1d:52:0a:58:41"
222225
- run:
223226
name: Install JavaScript dependencies
224227
command: npm --prefix ./glean install
@@ -234,9 +237,6 @@ jobs:
234237
- run:
235238
name: Setup SSH key and deploy docs to gh-pages branch
236239
command: |
237-
eval "$(ssh-agent -s)"
238-
DECODED_SSH_DEPLOY_KEY=$(echo $SSH_DEPLOY_KEY | base64 -d)
239-
ssh-add - \<<< "${DECODED_SSH_DEPLOY_KEY}"
240240
git config user.email "dataops+ci-bot@mozilla.com"
241241
git config user.name "dataops-ci-bot"
242242
npm --prefix ./glean run publish:docs

CHANGELOG.md

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

3-
[Full changelog](https://github.com/mozilla/glean.js/compare/v1.3.0...main)
3+
[Full changelog](https://github.com/mozilla/glean.js/compare/v1.4.0...main)
4+
5+
# v1.4.0 (2023-05-10)
6+
7+
[Full changelog](https://github.com/mozilla/glean.js/compare/v1.3.0...v1.4.0)
8+
9+
* [#1671](https://github.com/mozilla/glean.js/pull/1671): Allow building on Windows machines.
10+
* [#1674](https://github.com/mozilla/glean.js/pull/1674): Upgrade `glean_parser` version to `7.2.1`.
411

512
# v1.3.0 (2022-10-18)
613

automation/package-lock.json

Lines changed: 473 additions & 421 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

automation/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"author": "The Glean Team <glean-team@mozilla.com>",
2020
"license": "MPL-2.0",
2121
"devDependencies": {
22-
"@octokit/request": "^6.2.1",
23-
"browserstack-local": "^1.5.1",
24-
"geckodriver": "^3.0.2",
22+
"@octokit/request": "^6.2.3",
23+
"browserstack-local": "^1.5.2",
24+
"geckodriver": "^3.2.0",
2525
"selenium-webdriver": "^4.4.0",
26-
"webpack": "^5.74.0",
27-
"webpack-cli": "^4.10.0",
28-
"webpack-dev-server": "^4.11.1"
26+
"webpack": "^5.81.0",
27+
"webpack-cli": "^5.0.2",
28+
"webpack-dev-server": "^4.13.3"
2929
}
3030
}

docs/reference/metrics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- AUTOGENERATED BY glean_parser v6.2.1. DO NOT EDIT. -->
1+
<!-- AUTOGENERATED BY glean_parser v7.2.1. DO NOT EDIT. -->
22

33
# Metrics
44

@@ -62,5 +62,5 @@ This ping contains no metrics.
6262

6363
Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection).
6464

65-
<!-- AUTOGENERATED BY glean_parser v6.2.1. DO NOT EDIT. -->
65+
<!-- AUTOGENERATED BY glean_parser v7.2.1. DO NOT EDIT. -->
6666

docs/reference/sizes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To check out a comprehensive list of which metrics are collected by Glean and th
1313
|| Size |
1414
|--|--|
1515
|web|**56 KB**|
16-
|webext|**56 KB**|
16+
|webext|**55 KB**|
1717
|node|**55 KB**|
1818
|QML|**91 KB**|
1919
<!-- ! -->
@@ -37,7 +37,7 @@ to external consumers.
3737
|custom_distribution|5.4 KB |5.4 KB |5.4 KB |
3838
|datetime|1.1 KB |1.1 KB |1.1 KB |
3939
|event|1008 bytes |1008 bytes |1008 bytes |
40-
|labeled|362 bytes |375 bytes |361 bytes |
40+
|labeled|361 bytes |361 bytes |361 bytes |
4141
|memory_distribution|5.0 KB |5.0 KB |5.0 KB |
4242
|quantity|1.7 KB |1.7 KB |1.7 KB |
4343
|string|998 bytes |998 bytes |998 bytes |

glean/.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"jsdoc/no-types": "off",
3131
"jsdoc/require-param-type": "off",
3232
"jsdoc/require-returns-type": "off",
33+
"jsdoc/require-returns-check": "off",
3334
"import/no-named-as-default": "off",
3435
"import/no-duplicates": "off",
3536
"import/no-unresolved": "off",

0 commit comments

Comments
 (0)