1358590 - Add --cargo-channel switch to repack_rust.py

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Ralph Giles (:rillian)]

We sometimes want to ship a newer cargo than the one from the rust release we're using. Add a switch to the repack script to make this easier.

Comment 1

[Ralph Giles (:rillian)]

Attachment: Bug 1358590 - Update rust-build to v0.4.5.

Update the repack_rust script for packaging upsteam
rust builds for tooltool use in our build automation:

- Add --cargo-channel switch.
- Remove 32-bit macOS targets.
- Add aarch64 Android target.
- Update for cargo tarball name changes.
- Remove obsolete b2g target manifests.

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

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 8860498 [details]
Bug 1358590 - Update rust-build to v0.4.5.

https://reviewboard.mozilla.org/r/132502/#review135372

Thanks!

::: taskcluster/docker/rust-build/repack_rust.py:119
(Diff revision 1)
>      req.raise_for_status()
>      manifest = toml.loads(req.content)
>      if manifest['manifest-version'] != '2':
>          log('ERROR: unrecognized manifest version %s.' %
>              manifest['manifest-version'])
> -        return
> +        return None

This should probably just `raise` since nothing seems to handle this case anyway.

::: taskcluster/docker/rust-build/repack_rust.py:231
(Diff revision 1)
> -        return 'stable'
>  
>  if __name__ == '__main__':
> -    channel = args()
> -    repack(mac64, [mac64, mac32], channel=channel)
> -    repack(win32, [win32], channel=channel)
> +    args = args()
> +    repack(mac64, [mac64],
> +           channel=args.channel, cargo_channel=args.cargo_channel)

You can shorten this a little by doing `args = vars(args())` and then calling `repack(x, [x], **args)` to turn `args` into a dict and pass it as `kwargs`.

Comment 3

[Ralph Giles (:rillian)]

Thanks. I thought about passing the channels as a group but didn't realize that wouldn't clobber the `suffix` value. I'll update the script and also fix the flake8 lints.

Comment 4

[Ralph Giles (:rillian)]

Comment on attachment 8860498 [details]
Bug 1358590 - Update rust-build to v0.4.5.

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

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/81a606f52360
Update rust-build to v0.4.5. r=ted

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/81a606f52360