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

Work around broken cargo trim -d #860

Merged
merged 1 commit into from
Jul 23, 2021
Merged

Work around broken cargo trim -d #860

merged 1 commit into from
Jul 23, 2021

Conversation

jcape
Copy link
Contributor

@jcape jcape commented Jul 23, 2021

Motivation

PRs to master are still failing, due to a bug / change in cargo trim (the --directory argument doesn't appear to function)

In this PR

  • Run cargo trim init in the top-level and trusted enclave directories directly.

@jcape jcape requested review from a team July 23, 2021 17:46
@jcape jcape self-assigned this Jul 23, 2021
@jcape jcape added this to In progress in Consensus via automation Jul 23, 2021
Copy link
Contributor

@cbeck88 cbeck88 left a comment

Choose a reason for hiding this comment

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

What is the point of this step? Is it like making the ci build cache smaller?

Consensus automation moved this from In progress to Reviewer approved Jul 23, 2021
@jcape jcape marked this pull request as ready for review July 23, 2021 18:45
@jcape
Copy link
Contributor Author

jcape commented Jul 23, 2021

What is the point of this step? Is it like making the ci build cache smaller?

Yeah, the thing is, I don't know where/when we'd use that cache... It's bifurcated by arch and git revision, it feels like it's only going to be used if you re-run the same check on the same revision without changing anything---but I just want merges to master to start passing CI again, TBH :-)

@jcape jcape merged commit 2940fa4 into mobilecoinfoundation:master Jul 23, 2021
Consensus automation moved this from Reviewer approved to Done Jul 23, 2021
@jcape jcape deleted the bugfix/ci-cache-fix branch July 23, 2021 18:55
Consensus automation moved this from Done to Reviewer approved Aug 2, 2021
Consensus automation moved this from Reviewer approved to Done Aug 2, 2021
jcape pushed a commit that referenced this pull request Aug 17, 2021
* Update embargoed location list (based on master patches).
* Bump all crate versions
* Update TERMS-OF-USE.md (#869)
* Update changelog.
* Work around broken cargo trim -d (#860)
* When we test that the code builds, actually build (#826)
* Dont do cargo check, because it doesn't link anything.
* Pull in mac CI fixes from master.

Co-authored-by: Adam Mork <the-real-adammork@users.noreply.github.com>
Co-authored-by: garbageslam <beck.ct@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Consensus
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants