1681962 - Our fork of cargo-apk cannot read the new Cargo.lock file format

Status: RESOLVED FIXED

(Core :: Graphics: WebRender, defect)

Description

[Jamie Nicol [:jnicol]]

Recent versions of rust/cargo attempt to update gfx/wr/Cargo.lock to a new file format whenever a dependency is updated. Unfortunately, the version of cargo-apk we use to build wrench for android cannot read that format, so the build fails. We have worked around this so far by using an old version of cargo to update the lockfile, but that is very annoying.

Eventually we want to move from our fork of the old version of cargo-apk, to the new version. However, that depends on updating the version of winit and glutin that we use. This is being tracked in bug 1615148, however it is blocked currently as glutin does not yet work with the new cargo-apk.

In the meantime, we can update the version of cargo which our fork of cargo-apk depends on. The newest versions have API changes which cause cargo-apk to fail to build, but fortunately there are some versions that are new enough to read the new lock file format yet old enough to not break cargo-apk.

https://github.com/jamienicol/android-rs-glue/commit/86d9cb4db7bf7a8052e6765d9f8caae6009107cb

https://treeherder.mozilla.org/jobs?repo=try&revision=4214d68e807736b75139e6a0d7111b5c8b99c135

Comment 1

[Jamie Nicol [:jnicol]]

Attachment: Bug 1681962 - Update gfx/wr/Cargo.lock file format. r?jrmuizel

Comment 2

[Jamie Nicol [:jnicol]]

Attachment: Bug 1681962 - Update cargo-apk CI dependency to a version which can read the new Cargo.lock file format. r?jrmuizel

Depends on D99456

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/caa9fa60e4c3
Update gfx/wr/Cargo.lock file format. r=jrmuizel
https://hg.mozilla.org/integration/autoland/rev/883bcb152807
Update cargo-apk CI dependency to a version which can read the new Cargo.lock file format. r=jrmuizel

Comment 4

[Alexandru Michis [:malexandru]]

https://hg.mozilla.org/mozilla-central/rev/caa9fa60e4c3
https://hg.mozilla.org/mozilla-central/rev/883bcb152807