0c78703527
Depends on D64135 Differential Revision: https://phabricator.services.mozilla.com/D64137 --HG-- extra : moz-landing-system : lando |
||
|---|---|---|
| .. | ||
| converter.py | ||
| read-json.py | ||
| readme.md | ||
| sync-to-github.sh | ||
readme.md
Github synchronization scripts
This tool aims to help synchronizing changes from mozilla-central to Github on pushes.
This is useful for Gecko sub-projects that have Github mirrors, like gfx/wr linking to https://github.com/servo/webrender.
Originally, the tools were developed in https://github.com/staktrace/wrupdater,
then got moved under gfx/wr/ci-scripts/wrupdater,
and finally migrated here while also abstracting away from WebRender specifically.
The main entry point is the sync-to-github.sh script that is called with the following arguments:
- name of the project, matching the repository under
https://github.com/moz-gfxuser - relative folder in mozilla-central, which is the upstream for the changes
- downstream repository specified as "organization/project-name"
- name to call for auto-approving the pull request ("bors" or "@bors-servo")
It creates a staging directory at ~/.ghsync if one doesn't already exist,
and clones the the downstream repo into it.
The script also requires the GECKO_PATH environment variable
to point to a mercurial clone of mozilla-central, and access to the
taskcluster secrets service to get a Github API token.
The script does some setup steps but the bulk of the actual work
is done by the converter.py script. This script scans the mercurial
repository for new changes to the relative folder in m-c,
and adds commits to the git repository corresponding to those changes.
There are some details in the implementation that make it more robust
than simply exporting patches and attempting to reapply them;
in particular it builds a commit tree structure that mirrors what is found in
the mozilla-central repository with respect to branches and merges.
So if conflicting changes land on autoland and inbound, and then get
merged, the git repository commits will have the same structure with
a fork/merge in the commit history. This was discovered to be
necessary after a previous version ran into multiple cases where
the simple patch approach didn't really work.
One of the tests the converter.py does is finding the last sync point
between Github and mozilla-central. This is done based on the following markers:
- commit "[ghsync] From https://hg.mozilla.org/mozilla-central/rev/xxx"
- commit "[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/xxx"
- tag "mozilla-xxx"
Once the converter is done converting, the sync-to-github.sh script
finishes the process by pushing the new commits to moz-gfx/name
and generating a pull request against the downstream repository. It also
leaves a comment on the PR that triggers testing and merge of the PR.
If there is already a pull request (perhaps from a previous run) the
pre-existing PR is force-updated instead. This allows for graceful
handling of scenarios where the PR failed to get merged (e.g. due to
CI failures on the Github side).
The script is intended to by run by taskcluster for any changes that
touch the relative folder that land on mozilla-central. This may mean
that multiple instances of this script run concurrently, or even out
of order (i.e. the task for an older m-c push runs after the task for
a newer m-c push). The script was written with these possibilities in
mind and should be able to eventually recover from any such scenario
automatically (although it may take additional changes to mozilla-central
for such recovery to occur).