1340945 - vcssync: run "mach vendor rust" after a merge

Status: RESOLVED FIXED

(Developer Services :: Servo VCS Sync, defect)

Description

[:glob ✱]

change we need to run "mach vendor rust" to revendor the rust dependencies.

what exact form this takes depends on discussions on the stylo-team list:
https://groups.google.com/a/mozilla.com/d/msg/stylo-team/9GW82cJ1t6I/pgNrJ_EpDAAJ

Comment 1

[Manish Goregaokar [:manishearth]]

We discussed this in today's meeting. Tentative proposal is:

 - For now, until we have the double-autoland and trust checking (bug 1322798), just run it as part of vcssync, possibly creating a separate commit (I don't have opinions on that part)
 - Once we have double-autoland and trust-checking, any stylo-affecting Cargo.toml version bump on the Servo side (*not* cargo.lock changes, these don't affect m-c revendoring) will be blocked on m-c CI unless the newly introduced versions are trusted. Since in the double-autoland world if something can't land in m-c it can't land in servo either, this means that all stylo-affecting version bumps will have to be trust checked before landing anywhere.

Comment 2

[:glob ✱]

Attachment: vcssync: add system packages needed to build vendoring crates (bug 1340945);

Review commit: https://reviewboard.mozilla.org/r/117834/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117834/

Comment 3

[:glob ✱]

Attachment: vcssync: execute |mach vendor rust| after every servo merge (bug 1340945);

Review commit: https://reviewboard.mozilla.org/r/117836/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/117836/

Comment 4

[Steven MacLeod [:smacleod]]

Comment on attachment 8844349 [details]
vcssync: execute |mach vendor rust| after every servo merge (bug 1340945);

https://reviewboard.mozilla.org/r/117836/#review120004

::: vcssync/mozvcssync/servo.py:210
(Diff revision 1)
> +    os.chdir(repo_path)
> +    subprocess.check_call(['./mach', 'vendor', 'rust'])

`cwd=...` to set the working directory for `check_call()`.

It's not listed at https://docs.python.org/2/library/subprocess.html#subprocess.check_call but you can see

> The arguments shown above are merely the most common ones, described below in Frequently Used Arguments (hence the slightly odd notation in the abbreviated signature). The full function signature is the same as that of the Popen constructor - this functions passes all supplied arguments directly through to that interface.

see https://docs.python.org/2/library/subprocess.html#popen-constructor for description.

::: vcssync/mozvcssync/servo.py:221
(Diff revision 1)
> +            added = [line[2:] for line in touched if line.startswith('? ')]
> +            if added:
> +                run_hg(logger, repo, [b'add'] + added)
> +
> +            # Remove deleted files.
> +            removed = [line[2:] for line in touched if line.startswith('! ')]
> +            if removed:
> +                run_hg(logger, repo, [b'remove'] + removed)

`hg help addremove`

::: vcssync/mozvcssync/servo.py:231
(Diff revision 1)
> +            run_hg(logger, repo,
> +                   [b'commit', b'-m', b'revendor rust dependencies'])

Should probably stay consistent and prefix this with "servo: ", I know mcote's autoland metrics rely on filtering out these automated commits using that.

Comment 5

[Steven MacLeod [:smacleod]]

Comment on attachment 8844348 [details]
vcssync: add system packages needed to build vendoring crates (bug 1340945);

https://reviewboard.mozilla.org/r/117834/#review120012

Comment 6

[:glob ✱]

Comment on attachment 8844348 [details]
vcssync: add system packages needed to build vendoring crates (bug 1340945);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/117834/diff/1-2/

Comment 7

[:glob ✱]

Comment on attachment 8844349 [details]
vcssync: execute |mach vendor rust| after every servo merge (bug 1340945);

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/117836/diff/1-2/

Comment 8

[Steven MacLeod [:smacleod]]

Comment on attachment 8844349 [details]
vcssync: execute |mach vendor rust| after every servo merge (bug 1340945);

https://reviewboard.mozilla.org/r/117836/#review120096

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/8b7dfa09ad5f
vcssync: add system packages needed to build vendoring crates ; r=smacleod
https://hg.mozilla.org/hgcustom/version-control-tools/rev/7363fdb30646
vcssync: execute |mach vendor rust| after every servo merge ; r=smacleod

Comment 10

[:glob ✱]

deployed to production.

Comment 11

[:glob ✱]

oops.

https://hg.mozilla.org/hgcustom/version-control-tools/rev/7396b290d1f1bb19911247598c9de4701bd1a8d5