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

Update cargo lock #1060

Merged
merged 1 commit into from
Jun 1, 2020
Merged

Update cargo lock #1060

merged 1 commit into from
Jun 1, 2020

Conversation

rbehjati
Copy link
Contributor

@rbehjati rbehjati commented Jun 1, 2020

Github misled me to believe that merging #1045 would be conflict free! Here is the fix.

Checklist

  • Pull request affects core Oak functionality (e.g. runtime, SDK, ABI)
    • I have written tests that cover the code changes.
    • I have checked that these tests are run by Cloudbuild
    • I have updated documentation accordingly.
    • I have raised an issue to
      cover any TODOs and/or unfinished work.
  • Pull request includes prototype/experimental work that is under
    construction.

@tiziano88
Copy link
Collaborator

Thanks for the fix, I'll merge to unbreak the build ASAP.

@tiziano88 tiziano88 merged commit ffdfa66 into project-oak:master Jun 1, 2020
@github-actions
Copy link

github-actions bot commented Jun 1, 2020

Reproducibility Index:

95ec42fa4c0007805d047b07d942c860121c83a2e2e97390c0e3ba1140bcfef7  ./examples/target/wasm32-unknown-unknown/release/abitest_0_frontend.wasm
46353864578416c3a47692dcb9e1b508ab803e7f88138d333f351499e0674849  ./examples/target/wasm32-unknown-unknown/release/abitest_1_backend.wasm
61b479957a2ed92c7ecb10feee982839f941fd6cf4d1a8c585d9362c2b5aab53  ./examples/target/wasm32-unknown-unknown/release/aggregator.wasm
6ec5830ce3beedb20788488a984b6e260f4eb5069a7b1dd3d92791f04123d527  ./examples/target/wasm32-unknown-unknown/release/chat.wasm
479f7e7cf1b157da5d9098878bbe3e1a8c7615e46288f6ad02b0526e04533b50  ./examples/target/wasm32-unknown-unknown/release/hello_world.wasm
8d71b9c3587c5b73ab80d5f14bac6aae5fc4b36b990971a0482fc549efb8a964  ./examples/target/wasm32-unknown-unknown/release/machine_learning.wasm
c9f51da5c57023acd4cb2f62619b4b25843ac61fccecd1ea7bd47de58cd90a72  ./examples/target/wasm32-unknown-unknown/release/private_set_intersection.wasm
51dd042a18dc51a767c54db46c49ad7e4a7af0e042c41f43f43d76a5171abe6f  ./examples/target/wasm32-unknown-unknown/release/running_average.wasm
ce6ce387935e09a55681f48516215af08bc344b500ad6342e3280cabc7b5da89  ./examples/target/wasm32-unknown-unknown/release/translator.wasm
a4c456e4da50d72d91ed55d7cc2e689af8cd6104173bb478bcb48643c8e12b31  ./target/x86_64-unknown-linux-musl/release/oak_loader

Reproducibility Index diff:

@rbehjati rbehjati deleted the cargo-diff branch June 17, 2020 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants