Fix cargo-bazel recompile for MODULE.bazel #2570

ericmcbride · 2024-03-22T09:22:36Z

Addresses cargo-bazel always recompiling with Bzlmod #2531
Wrote a function, thats basically copy / pasted from crates_universe/private/generate_utils.bzl to account for the module_ctx Can probably make the original function more generic if thats more desired. I'm not sure if the maintainers would prefer a one off, since the MODULE.bazel feature set for crates_universe isn't exactly "Stable" yet.
Noticed theres no way to "bootstrap" the new cargo features in MODULE.bazel , like you can for crates_universe. May need to open an issue for this. Tested by using the CARGO_BAZEL_GENERATOR_URL and CARGO_BAZEL_GENERATOR_SHA256 environmentals. This looks to cause some failing unit tests. Not sure how to get support on this
Failsafe of using the cargo buildstrap cargo-bazel if no URLs are found, and if theres no environmentals.

google-cla · 2024-03-22T09:22:41Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

crate_universe/private/module_extensions/cargo_bazel_bootstrap.bzl

UebelAndre

Thanks! Good catch here! I just had a couple of nits

crate_universe/extension.bzl

UebelAndre · 2024-03-22T15:39:38Z

Noticed theres no way to "bootstrap" the new cargo features in MODULE.bazel , like you can for crates_universe. May need to open an issue for this. Tested by using the CARGO_BAZEL_GENERATOR_URL and CARGO_BAZEL_GENERATOR_SHA256 environmentals. This looks to cause some failing unit tests. Not sure how to get support on this

This can probably be spawned into a separate issue.

…bride/rules_rust into add_get_generator_support_bzl_mod

UebelAndre

Thanks!

UebelAndre · 2024-03-26T13:40:30Z

Noticed theres no way to "bootstrap" the new cargo features in MODULE.bazel , like you can for crates_universe. May need to open an issue for this. Tested by using the CARGO_BAZEL_GENERATOR_URL and CARGO_BAZEL_GENERATOR_SHA256 environmentals. This looks to cause some failing unit tests. Not sure how to get support on this

This can probably be spawned into a separate issue.

Would you also be willing to write up a new issue for this?

ericmcbride · 2024-03-26T14:06:41Z

Noticed theres no way to "bootstrap" the new cargo features in MODULE.bazel , like you can for crates_universe. May need to open an issue for this. Tested by using the CARGO_BAZEL_GENERATOR_URL and CARGO_BAZEL_GENERATOR_SHA256 environmentals. This looks to cause some failing unit tests. Not sure how to get support on this

This can probably be spawned into a separate issue.

Would you also be willing to write up a new issue for this?

On it

UebelAndre · 2024-03-26T15:20:05Z

I also might have messed up resolving the merge conflict. Would you be able to take a look?

ericmcbride · 2024-03-26T15:28:20Z

I also might have messed up resolving the merge conflict. Would you be able to take a look?

Yes. I also see main is failing for the same reason, just a different job

Main Failure:

OSError: [Errno 8] Exec format error: '/tmp/tmpiq788gfy/bazelci-agent'

My Failure:

OSError: [Errno 8] Exec format error: '/tmp/tmpb3zib8cm/bazelci-agent'

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [rules_rust](https://togithub.com/bazelbuild/rules_rust) | http_archive | minor | `0.40.0` -> `0.41.0` | --- ### Release Notes <details> <summary>bazelbuild/rules_rust (rules_rust)</summary> ### [`v0.41.0`](https://togithub.com/bazelbuild/rules_rust/releases/tag/0.41.0) [Compare Source](https://togithub.com/bazelbuild/rules_rust/compare/0.40.0...0.41.0) ### 0.41.0 ```python load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_rust", integrity = "sha256-Y4v6kjQQfXxh5tU6FQB6YXux/ODFGUq3IlpgBV4Bwj8=", urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.41.0/rules_rust-v0.41.0.tar.gz"], ) ``` Additional documentation can be found at: https://bazelbuild.github.io/rules_rust/#setup #### What's Changed - Add example of cross-compiling with musl by [@illicitonion](https://togithub.com/illicitonion) in [bazelbuild/rules_rust#2535 - Temporarily disable "Examples Clang with LLD" CI job by [@UebelAndre](https://togithub.com/UebelAndre) in [bazelbuild/rules_rust#2560 - Update cargo_toml to `0.19.2` by [@jun-sheaf](https://togithub.com/jun-sheaf) in [bazelbuild/rules_rust#2551 - Stop rustfmt versioning from overriding rust-analyzer versioning. by [@ReticentIris](https://togithub.com/ReticentIris) in [bazelbuild/rules_rust#2553 - Rust Analyzer added NixOS supported platforms by [@rickvanprim](https://togithub.com/rickvanprim) in [bazelbuild/rules_rust#2547 - Removed unused 'select_with_or' by [@dzbarsky](https://togithub.com/dzbarsky) in [bazelbuild/rules_rust#2562 - Added Rust 1.77.0 by [@UebelAndre](https://togithub.com/UebelAndre) in [bazelbuild/rules_rust#2568 - bzlmod: fix issue with nightly versions by [@QuentinPerez](https://togithub.com/QuentinPerez) in [bazelbuild/rules_rust#2545 - Allow a no-cargo setup for bzlmod by [@dzbarsky](https://togithub.com/dzbarsky) in [bazelbuild/rules_rust#2565 - Fixed genquery for rust targets by [@UebelAndre](https://togithub.com/UebelAndre) in [bazelbuild/rules_rust#2559 - Fix cargo-bazel recompile for MODULE.bazel by [@ericmcbride](https://togithub.com/ericmcbride) in [bazelbuild/rules_rust#2570 - Minor cleanup of bzl files by [@UebelAndre](https://togithub.com/UebelAndre) in [bazelbuild/rules_rust#2573 - Added starlark unit tests for `rust_toolchain.opt_level` by [@UebelAndre](https://togithub.com/UebelAndre) in [bazelbuild/rules_rust#2578 - Mark the bzlmod extension reproducible as appropriate by [@dzbarsky](https://togithub.com/dzbarsky) in [bazelbuild/rules_rust#2575 - Release 0.41.0 by [@UebelAndre](https://togithub.com/UebelAndre) in [bazelbuild/rules_rust#2569 #### New Contributors - [@jun-sheaf](https://togithub.com/jun-sheaf) made their first contribution in [bazelbuild/rules_rust#2551 - [@ReticentIris](https://togithub.com/ReticentIris) made their first contribution in [bazelbuild/rules_rust#2553 - [@QuentinPerez](https://togithub.com/QuentinPerez) made their first contribution in [bazelbuild/rules_rust#2545 - [@ericmcbride](https://togithub.com/ericmcbride) made their first contribution in [bazelbuild/rules_rust#2570 **Full Changelog**: bazelbuild/rules_rust@0.40.0...0.41.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/bazel-contrib/toolchains_llvm).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Add get_generator support for MODULE.bazel

4c8ec89

ericmcbride added 3 commits March 22, 2024 04:24

update

3fa37fe

update

1b5cfdd

update

8545bb5

ericmcbride changed the title ~~WIP: Fix cargo-bazel recompile for MODULE.bazel~~ Fix cargo-bazel recompile for MODULE.bazel Mar 22, 2024

Merge branch 'main' into add_get_generator_support_bzl_mod

53cd0b2

dzbarsky reviewed Mar 22, 2024

View reviewed changes

crate_universe/private/module_extensions/cargo_bazel_bootstrap.bzl Outdated Show resolved Hide resolved

UebelAndre requested changes Mar 22, 2024

View reviewed changes

crate_universe/extension.bzl Outdated Show resolved Hide resolved

crate_universe/extension.bzl Outdated Show resolved Hide resolved

ericmcbride added 5 commits March 22, 2024 13:50

address PR comments

896f6d3

Merge branch 'add_get_generator_support_bzl_mod' of github.com:ericmc…

56a216e

…bride/rules_rust into add_get_generator_support_bzl_mod

oops

6fd0596

quick-fix

c13db51

address buildifier

970087c

ericmcbride requested a review from UebelAndre March 25, 2024 12:32

ericmcbride and others added 4 commits March 25, 2024 07:33

Merge branch 'main' into add_get_generator_support_bzl_mod

e296b4e

move output

d619a38

Merge branch 'add_get_generator_support_bzl_mod' of github.com:ericmc…

67cf852

…bride/rules_rust into add_get_generator_support_bzl_mod

buildifier

675d290

UebelAndre enabled auto-merge March 26, 2024 13:39

UebelAndre approved these changes Mar 26, 2024

View reviewed changes

UebelAndre added this pull request to the merge queue Mar 26, 2024

UebelAndre removed this pull request from the merge queue due to a manual request Mar 26, 2024

UebelAndre added this pull request to the merge queue Mar 26, 2024

github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Mar 26, 2024

Merge branch 'main' into add_get_generator_support_bzl_mod

cb94d5b

UebelAndre enabled auto-merge March 26, 2024 13:55

fix docstring

27816e4

auto-merge was automatically disabled March 26, 2024 15:37
Head branch was pushed to by a user without write access

ericmcbride and others added 3 commits March 26, 2024 10:42

update

c9fb924

fix

16933f4

Merge branch 'main' into add_get_generator_support_bzl_mod

74dd878

UebelAndre enabled auto-merge March 26, 2024 17:06

UebelAndre added this pull request to the merge queue Mar 26, 2024

Merged via the queue into bazelbuild:main with commit fc601ba Mar 26, 2024
3 checks passed

ericmcbride deleted the add_get_generator_support_bzl_mod branch March 26, 2024 21:51

This was referenced Apr 1, 2024

cargo-bazel always recompiling with Bzlmod #2531

Closed

Bzlmod setup does not use CARGO_BAZEL_URLS for crates universe #2442

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix cargo-bazel recompile for MODULE.bazel #2570

Fix cargo-bazel recompile for MODULE.bazel #2570

ericmcbride commented Mar 22, 2024 •

edited

google-cla bot commented Mar 22, 2024

UebelAndre left a comment

UebelAndre commented Mar 22, 2024

UebelAndre left a comment

UebelAndre commented Mar 26, 2024

ericmcbride commented Mar 26, 2024

UebelAndre commented Mar 26, 2024

ericmcbride commented Mar 26, 2024 •

edited

Fix cargo-bazel recompile for MODULE.bazel #2570

Fix cargo-bazel recompile for MODULE.bazel #2570

Conversation

ericmcbride commented Mar 22, 2024 • edited

google-cla bot commented Mar 22, 2024

UebelAndre left a comment

Choose a reason for hiding this comment

UebelAndre commented Mar 22, 2024

UebelAndre left a comment

Choose a reason for hiding this comment

UebelAndre commented Mar 26, 2024

ericmcbride commented Mar 26, 2024

UebelAndre commented Mar 26, 2024

ericmcbride commented Mar 26, 2024 • edited

ericmcbride commented Mar 22, 2024 •

edited

ericmcbride commented Mar 26, 2024 •

edited