Closed Bug 1529001 Opened 10 months ago Closed 10 months ago

Properly package fxmonitor l10n in the build system

Categories

(Firefox :: Firefox Monitor, enhancement)

enhancement
Not set

Tracking

()

RESOLVED FIXED
Firefox 67
Tracking Status
firefox67 --- fixed

People

(Reporter: nhnt11, Assigned: nhnt11)

References

Details

Attachments

(1 file, 3 obsolete files)

We need to:

  1. mv locale locales
  2. Make a jar.mn and include that from moz.build
  3. Include our strings in the en-US workflow (browser/locales/l10n.{ini, toml})
  4. Notify flod when the patch is ready so that he can prepare a script to move the strings from GitHub

Depends on D20362

Attachment #9044976 - Attachment is obsolete: true
Attachment #9044975 - Attachment is obsolete: true
Attachment #9044974 - Attachment is obsolete: true

flod, this patch seems ready to land. Could you chime in on this bug about next steps to migrate strings over from github? IIRC, you need to prepare a script for this, and then this patch can land, after which you will run the script - is that correct?

Flags: needinfo?(francesco.lodolo)

@Pike

I've adapted the script to this project paths.
https://github.com/flodolo/scripts/blob/master/mozilla_l10n/convert_from_github/monitor-l10n-convert.py

Source is this repo, l10n branch
https://github.com/mozilla/blurts-addon/

But when I run the script on it, I end up with 3 commits:

  • Rename src/locales/ to src/locale/
  • Add more license headers
  • Pontoon: Update Italian (it) localization of Firefox Monitor Add-on draft l10n master remote/master

The first 2 are not from the branch I'm in, they're from a branch that is not merged to master or l10n
https://github.com/mozilla/blurts-addon/pull/143/commits

As a result, I also end up with no file in the hg local repository (because of the directory change).

Any idea on how I could make it work?

Flags: needinfo?(francesco.lodolo) → needinfo?(l10n)

Maybe a branchmap would help, https://www.mercurial-scm.org/wiki/ConvertExtension#A--branchmap

l10n default
Flags: needinfo?(l10n)

Leaving NI. This doesn't seem to work, will debug tomorrow with Axel.

Flags: needinfo?(francesco.lodolo)

We have a solution, feel free to merge
https://github.com/flodolo/scripts/pull/3

Flags: needinfo?(francesco.lodolo)

Thanks! Marking this checkin-needed.

Keywords: checkin-needed
Keywords: checkin-needed

Backed out changeset ff3a260bd20d (bug 1529001) for l10n-check bustages on a CLOSED TREE.

Backout link: https://hg.mozilla.org/integration/autoland/rev/db427d696aaac383eb4a61c7357854df6746078c

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&resultStatus=testfailed%2Cbusted%2Cexception&classifiedState=unclassified&revision=ff3a260bd20df53104c0c419bf7c37d4689fbd66&selectedJob=230616370

Log link: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=230616370&repo=autoland&lineNumber=37618

Log snippet:

[task 2019-02-26T20:33:28.597Z] 20:33:28 INFO - l10n-check> make[5]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/browser/locales'
[task 2019-02-26T20:33:30.087Z] 20:33:30 INFO - l10n-check> make[6]: Entering directory '/builds/worker/workspace/build/src/obj-firefox/browser/locales'
[task 2019-02-26T20:33:30.087Z] 20:33:30 INFO - l10n-check> /builds/worker/workspace/build/src/obj-firefox/_virtualenvs/init/bin/python /builds/worker/workspace/build/src/toolkit/mozapps/installer/l10n-repack.py '/builds/worker/workspace/build/src/obj-firefox/dist/l10n-stage/firefox' ../../dist/xpi-stage/locale-x-test
[task 2019-02-26T20:33:30.087Z] 20:33:30 INFO - l10n-check>
[task 2019-02-26T20:33:30.087Z] 20:33:30 INFO - l10n-check>
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> Error: Locale doesn't contain browser/features/fxmonitor@mozilla.org/
[task 2019-02-26T20:33:30.088Z] 20:33:30 ERROR - l10n-check> Traceback (most recent call last):
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> File "/builds/worker/workspace/build/src/toolkit/mozapps/installer/l10n-repack.py", line 58, in <module>
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> main()
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> File "/builds/worker/workspace/build/src/toolkit/mozapps/installer/l10n-repack.py", line 54, in main
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> non_resources=args.non_resource, non_chrome=NON_CHROME)
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> File "/builds/worker/workspace/build/src/python/mozbuild/mozpack/packager/l10n.py", line 310, in repack
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> _repack(app_finder, l10n_finder, copier, formatter, non_chrome)
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> File "/usr/lib/python2.7/contextlib.py", line 24, in exit
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> self.gen.next()
[task 2019-02-26T20:33:30.088Z] 20:33:30 INFO - l10n-check> File "/builds/worker/workspace/build/src/python/mozbuild/mozpack/errors.py", line 131, in accumulate
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> raise AccumulatedErrors()
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> mozpack.errors.AccumulatedErrors
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> /builds/worker/workspace/build/src/toolkit/locales/l10n.mk:115: recipe for target 'repackage-zip' failed
[task 2019-02-26T20:33:30.089Z] 20:33:30 ERROR - l10n-check> make[6]: *** [repackage-zip] Error 1
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> make[6]: Leaving directory '/builds/worker/workspace/build/src/obj-firefox/browser/locales'
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> /builds/worker/workspace/build/src/toolkit/locales/l10n.mk:155: recipe for target 'repackage-zip-x-test' failed
[task 2019-02-26T20:33:30.089Z] 20:33:30 ERROR - l10n-check> make[5]: *** [repackage-zip-x-test] Error 2
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> Makefile:107: recipe for target 'installers-x-test' failed
[task 2019-02-26T20:33:30.089Z] 20:33:30 ERROR - l10n-check> make[4]: *** [installers-x-test] Error 2
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> Makefile:128: recipe for target 'l10n-check' failed
[task 2019-02-26T20:33:30.089Z] 20:33:30 ERROR - l10n-check> make[3]: *** [l10n-check] Error 2
[task 2019-02-26T20:33:30.089Z] 20:33:30 INFO - l10n-check> /builds/worker/workspace/build/src/browser/build.mk:36: recipe for target 'l10n-check' failed
[task 2019-02-26T20:33:30.090Z] 20:33:30 ERROR - l10n-check> make[2]: *** [l10n-check] Error 2
[task 2019-02-26T20:33:30.090Z] 20:33:30 INFO - /builds/worker/workspace/build/src/build/moz-automation.mk:84: recipe for target 'automation/l10n-check' failed
[task 2019-02-26T20:33:30.090Z] 20:33:30 ERROR - make[1]: *** [automation/l10n-check] Error 2
[task 2019-02-26T20:33:30.090Z] 20:33:30 INFO - client.mk:129: recipe for target 'build' failed
[task 2019-02-26T20:33:30.090Z] 20:33:30 INFO - make: *** [build] Error 2
[task 2019-02-26T20:33:30.113Z] 20:33:30 INFO - 281 compiler warnings present.
[task 2019-02-26T20:33:30.161Z] 20:33:30 INFO - Notification center failed: Install notify-send (usually part of the libnotify package) to get a notification when the build finishes.
[task 2019-02-26T20:33:30.212Z] 20:33:30 ERROR - Return code: 2

Flags: needinfo?(nhnt11)

I missed a couple of spots when updating build files. I pushed a new version of the patch, here's a link to the interdiff for convenience: https://phabricator.services.mozilla.com/D20366?vs=64557&id=67547

Try push with new patch: https://treeherder.mozilla.org/#/jobs?repo=try&revision=c03dbe81f6e699888ec0772f0e072b01be46a920

Flags: needinfo?(nhnt11)
Attachment #9044979 - Attachment description: Bug 1529001 - Add locales to the build. r=johannh,Pike → Bug 1529001 - fxmonitor: properly package l10n in the build system. r=johannh,Pike

Added an exception for chrome://fxmonitor/locale/ in browser_all_files_referenced.js - the manifest is registered at runtime and since the add-on is pref'd off and doesn't run by default, the test complains.

Another try push: https://treeherder.mozilla.org/#/jobs?repo=try&revision=ba5b040a50ed2627b437a783e720554ff43cb7b6

Try is green, let's try again to land this.

Keywords: checkin-needed

Pushed by apavel@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/dce3ee76ccd9
fxmonitor: properly package l10n in the build system. r=johannh

Keywords: checkin-needed
Status: ASSIGNED → RESOLVED
Closed: 10 months ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 67
Depends on: 1532001
Summary: Add locales to the build → Properly package fxmonitor l10n in the build system
You need to log in before you can comment on or make changes to this bug.