827778 - Move shared/resources/languages-*.json to locales/

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia, defect)

Description

[Staś Małolepszy :stas]

These files don't need to be in shared.  On build time, we just need to copy one of them into shared/resources.

Comment 1

[Staś Małolepszy :stas]

Ben -- we'd like to move the json files and rename them (s/-/_).  How much hassle is this going to be for releng?

Comment 2

[Fabien Cazenave [:kaze]]

I could propose a patch if I knew where the related code lives. :-)

Comment 3

[[e-mail] (:bhearsum)]

(In reply to Staś Małolepszy :stas from comment #1)
> Ben -- we'd like to move the json files and rename them (s/-/_).  How much
> hassle is this going to be for releng?

This isn't a big deal, we just need to update our configs. However, the change needs to happen in two stages to avoid unnecessary burning.
* Stage 1 - copy files to new location, after that we'll update our configs to point at them.
* Stage 2 - delete old files, after we verify that nothing is using the old configs.

Comment 4

[Aki Sasaki (not active)]

https://github.com/mozilla-b2g/gaia/pull/7399

Comment 5

[Staś Małolepszy :stas]

Attachment: Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7399

Pointer to Github pull-request

Comment 6

[Staś Małolepszy :stas]

Comment on attachment 699675 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7399

Asking for review on behalf of Aki.

Comment 7

[Fabien Cazenave [:kaze]]

Comment on attachment 699675 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7399

[Approval Request Comment]
Bug caused by (feature/regressing bug #): multilocale build system
User impact if declined: 
Testing completed: manual
Risk to taking this patch (and alternatives if risky): none

Comment 8

[Ben Francis [:benfrancis]]

Comment on attachment 699675 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7399

Vivien has asked me to process these approvals.

This patch has extremely low risk and prevents potential future problems in Gaia so approval-gaia-master+

Comment 9

[Fabien Cazenave [:kaze]]

I’ve just merged this patch, which /copies/ files to the locales/ directory.

To close the bug we'll need another patch that actually removes all languages-*.json files from shared/resources/.

Comment 10

[Aki Sasaki (not active)]

Step 1.5: wait for that patch to get merged into the nightly branch
Step 2: point buildbot at locales/languages_*.json (patch, review, land, reconfig, verify)
Step 3: remove shared/resourcs/languages-*.json

Comment 11

[Staś Małolepszy :stas]

Step 3.5 Change the Makefile's LOCALES_FILE definition:

> LOCALES_FILE?=shared/resources/languages.json

https://github.com/mozilla-b2g/gaia/blob/f53fc73ad77ff7f7ca50ff4ca279fdf2b3d95eab/Makefile#L81

Comment 12

[Aki Sasaki (not active)]

I don't think I touched languages.json, just languages-*.json.
If we end up moving that, that can happen anywhere between step 1 and 3.

Comment 13

[Aki Sasaki (not active)]

Attachment: point to locales/languages_*.json

Points buildbot at locales/languages_*.json instead of shared/resources/languages-*.json.

Also points otoro (b2g18 only, but otoro's only enabled there) to languages_basecamp.json (3 locales).

Comment 14

[Aki Sasaki (not active)]

Might as well take this bug.

Comment 15

[Aki Sasaki (not active)]

Updated https://developer.mozilla.org/en-US/docs/Mozilla/Firefox_OS/Building#Building_multilocale

Comment 16

[Aki Sasaki (not active)]

Step 1.5: wait for that patch to get merged into the nightly branch
Step 2: point buildbot at locales/languages_*.json
* patch: DONE
* review: DONE
* land: waiting for gaia patch to merge to nightly branch <-- we are here
* reconfig
* verify
Step 3: remove shared/resources/languages-*.json

Comment 17

[Aki Sasaki (not active)]

Comment on attachment 700588 [details] [diff] [review]
point to locales/languages_*.json

http://hg.mozilla.org/build/buildbot-configs/rev/c96b21bd4eb9

Comment 18

[Aki Sasaki (not active)]

(In reply to Aki Sasaki [:aki] from comment #16)
> Step 1.5: wait for that patch to get merged into the nightly branch: DONE
> Step 2: point buildbot at locales/languages_*.json
> * patch: DONE
> * review: DONE
> * land: DONE
> * reconfig <-- we are here
> * verify
> Step 3: remove shared/resources/languages-*.json

Comment 19

[Aki Sasaki (not active)]

> Step 1.5: wait for that patch to get merged into the nightly branch: DONE
> Step 2: point buildbot at locales/languages_*.json
> * patch: DONE
> * review: DONE
> * land: DONE
> * reconfig: DONE
> * verify: DONE
> Step 3: remove shared/resources/languages-*.json <-- we are here

We're ready to remove the languages-*.json at any point.
I'd feel safest if we resolve bug 829683 first though.

Comment 20

[[e-mail] (:bhearsum)]

The buildbot part of this seems to have broken Date, which uses the gaia-v1-train repo: https://tbpl.mozilla.org/php/getParsedLog.php?id=18988345&tree=Date&full=1

Comment 21

[[e-mail] (:bhearsum)]

Probably not related to this bug:
https://hg.mozilla.org/integration/gaia-v1-train/file/4835e1f9e14b/locales
vs.
https://hg.mozilla.org/integration/gaia-nightly/file/e84cc9f3e1e5/locales

Comment 22

[Aki Sasaki (not active)]

They're missing the pull request https://github.com/mozilla-b2g/gaia/pull/7399 .
Is gaia-v1-train not merging from gaia-nightly?

Comment 23

[Aki Sasaki (not active)]

Catlee refreshed the v1-train branch on github.

Comment 24

[Aki Sasaki (not active)]

Attachment: Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7742

NOTE: If blocking-basecamp+ is set, just land it for now.

[Approval Request Comment]
Bug caused by (feature/regressing bug #): 
User impact if declined: 
Testing completed: 
Risk to taking this patch (and alternatives if risky):

Comment 25

[Aki Sasaki (not active)]

Oops. Other than the add-then-remove the approval flag, I think I did the pull request right.

Comment 26

[Aki Sasaki (not active)]

Comment on attachment 705167 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7742

NOTE: If blocking-basecamp+ is set, just land it for now.

[Approval Request Comment]
Bug caused by (feature/regressing bug #): 

This bug, bug 827778 comment 0.

User impact if declined: 

Extraneous files in source.

Testing completed: 

We're already building against locales/languages_*.json, so these should be unused.

Risk to taking this patch (and alternatives if risky):

Low risk.

Comment 27

[Lukas Blakk [:lsblakk] use ?needinfo]

Comment on attachment 705167 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7742

just removing unused code, approving for v1-train uplift.

Comment 28

[Aki Sasaki (not active)]

Comment on attachment 705167 [details]
Pointer to Github pull request: https://github.com/mozilla-b2g/gaia/pull/7742

Merged to gaia master:
https://github.com/mozilla-b2g/gaia/commit/b5376f6773c080507b15836f469a7a1fedb2e5dc

Comment 29

[Aki Sasaki (not active)]

gaia v1-train:
https://github.com/mozilla-b2g/gaia/commit/0f00aee9dde56ff565bd5419d9ee67e98b3c6f51

gaia v1.0.0:
https://github.com/mozilla-b2g/gaia/commit/0abc95774d0bbdfe314fa588e09fc92cac3e6427

I think we're done here.

Comment 30

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Aki Sasaki [:aki] from comment #29)
> gaia v1-train:
> https://github.com/mozilla-b2g/gaia/commit/
> 0f00aee9dde56ff565bd5419d9ee67e98b3c6f51
> 
> gaia v1.0.0:
> https://github.com/mozilla-b2g/gaia/commit/
> 0abc95774d0bbdfe314fa588e09fc92cac3e6427
> 
> I think we're done here.

Can you please verify that both pull requests have landed.  If everything is landed, please set status-b2g18 to 'fixed'

Comment 31

[Aki Sasaki (not active)]

Both are landed, setting flag.

Comment 32

[Lukas Blakk [:lsblakk] use ?needinfo]

Batch edit: bugs fixed on b2g18 since 1/25 branch of v1.0 are fixed on v1.0.1