Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nix prep] trace-tool: use newer cargo version, update Cargo.lock #10568

Merged
merged 2 commits into from
Apr 28, 2022

Conversation

balsoft
Copy link
Contributor

@balsoft balsoft commented Mar 22, 2022

trace-tool was built using outdated rustToolchain, even though newer
versions of cargo/rustc are already part of the main Mina
toolchain. Use the main toolchain to build trace-tool, and update
Cargo.lock format to the newer version.

@balsoft balsoft requested review from a team as code owners March 22, 2022 08:52
@yorickvP yorickvP added the ci-build-me Add this label to trigger a circle+buildkite build for this branch label Mar 28, 2022
@yorickvP yorickvP added the Tweag label Apr 11, 2022
Copy link
Contributor

@lk86 lk86 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved as the changes would work as-is, but see Comments

@@ -24,7 +24,7 @@ Pipeline.build
steps = [
Command.build
Command.Config::{
commands = [ Cmd.runInDocker jobDocker "cd src/app/trace-tool ; cargo check --frozen" ]
commands = RunInToolchain.runInToolchainBuster ([] : List Text) "cd src/app/trace-tool ; PATH=/home/opam/.cargo/bin:$PATH cargo check"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use runInToolchainBullseye ? I have a PR in flight that will make bullseye the default everywhere so this would better set up for that work

@@ -24,7 +25,7 @@ Pipeline.build
steps = [
Command.build
Command.Config::{
commands = [ Cmd.runInDocker jobDocker "cd src/app/trace-tool && cargo build --frozen" ]
commands = RunInToolchain.runInToolchainBuster ([] : List Text) "cd src/app/trace-tool && PATH=/home/opam/.cargo/bin:$PATH cargo build"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, runInToolchainBullseye would be preferable

@balsoft balsoft merged commit 5952d2d into compatible Apr 28, 2022
@balsoft balsoft deleted the trace-tool-cargo-update branch April 28, 2022 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-build-me Add this label to trigger a circle+buildkite build for this branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants