Skip to content

Bug 1786272 - Qt sample project updates #1449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 23, 2022
Merged

Bug 1786272 - Qt sample project updates #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e0fede
Add notes about version numbers in QT docs
rosahbruno Aug 22, 2022
ed01637
Fix version regex in prepare-release script
rosahbruno Aug 22, 2022
a07a97a
Update CHANGELOG.md
rosahbruno Aug 22, 2022
6d59d6f
Update CHANGELOG.md
rosahbruno Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

[Full changelog](https://github.com/mozilla/glean.js/compare/v1.1.0...main)

* [#1449](https://github.com/mozilla/glean.js/pull/1449): BUGFIX: Add missing quotes to `prepare-release` script to fix issues with version numbers in Qt sample README & circle ci config.
* [#1449](https://github.com/mozilla/glean.js/pull/1449): Update Qt sample project docs to include note about problems with different version numbers of Qt commands.

# v1.1.0 (2022-07-18)

[Full changelog](https://github.com/mozilla/glean.js/compare/v1.0.0...v1.1.0)
Expand Down
4 changes: 2 additions & 2 deletions bin/prepare-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ run rm "${WORKSPACE_ROOT}/${FILE}.bak"

FILE=samples/qt/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}\"/" \
-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}\"/" \
-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"

Expand Down
4 changes: 3 additions & 1 deletion samples/qt/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ pip3 install -r requirements.txt # Install glean_parser

4. Generate metrics and pings files:

> **Note**: The version number below should match the last [released version](https://github.com/mozilla/glean.js/releases) number (minus the trailing `.0`). If the version numbers are different you will run into issues with QML code compilation. To resolve these errors you have to adjust the versions manually in the QML files

```bash
glean_parser translate src/App/metrics.yaml src/App/pings.yaml -f javascript -o src/App/generated \
--option platform=qt --option version="0.31"
--option platform=qt --option version="1.1"
```

5. Build the app:
Expand Down