-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Description
Background
The translatewiki branch diverged from develop one year ago, and has not had any updates (relevantly: of any of the gulpfiles) since then. As a result, it is not clear what procedures should be used to merge TranslateWiki updates into develop and rebuild the language files (or indeed even what order those should happen in.)
Separately, there is the question of whether we should even continue to have checked-in copies of the built langfiles in the blockly repository.
Proposed changes to repository
develop branch
I propose that we:
- remove
msg/js/*from the repository, - configure all applicable test harnesses, playgrounds, package scripts etc., to load from
build/msginstead, and - configure the npm
preparescript, run as a side effect ofnpm install, to to runbuildLangfiles.- This is very fast and can be done in parallel with the existing
buildJavascript+buildDepssequence.
- This is very fast and can be done in parallel with the existing
translatewiki branch
At minimum we should update translatewiki from develop—preferably via a merge commit, to make it very clear in the history—and continue to do so on a regular basis.
We could consider deleting everything except msg/json from translatewiki. This would reduce the likelihood of an unauthorised code change being inadvertently merged from this branch in to develop.
Deleting everything except the translations would create some difficultly in easily merging back and forth between the two branches. To facilitate merges from translatewiki to develop, a subterfugous merge commit (in that direction) could be created, claiming to include the deletion without actually doing. This would mean that subsequent PRs would not attempt to delete bulk of the codebase from develop.
Updating in the reverse direction would probably entail manual copying between branches.
Proposed changes to procedures
We should create a new document explaining how to merge TranslateWiki update from translatewiki to develop and (if they have not been deleted from the repository) rebuild the compiled langfiles. This document should be linked from (and replace the existing) "merge in translate wiki updates" section of our internal "day of release" documentation.
Insofar as feasible, the procedure should:
- Ensure that any scripts/tooling that is needed is run from the
developbranch if possible, or failing that from thetranslatewikibranch only after it has been updated fromdevelop - Include running
npm ciat appropriate points to ensure that dependencies are up-to-date.