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

rust: specify ring version #3981

Merged
merged 2 commits into from
Jun 1, 2021
Merged

Conversation

ptrus
Copy link
Member

@ptrus ptrus commented Jun 1, 2021

Specify exact ring version in Cargo.toml as otherwise project depending on oasis-runtime (e.g. oasis-sdk), will need to manually lock ring to the exact version.

@ptrus ptrus force-pushed the ptrus/internal/specific-ring-version branch from 9f4d9f5 to 1469aa9 Compare June 1, 2021 08:47
Copy link
Member

@kostko kostko left a comment

Choose a reason for hiding this comment

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

Makes sense. What's with all the updates in Cargo.lock?

@ptrus
Copy link
Member Author

ptrus commented Jun 1, 2021

I updated Cargo.lock (via cargo update) as a test to ensure ring version will stay at the specified version.

I think now that oasis-runtime is also used as a library (in oasis-sdk) we should try keeping Cargo.lock up to date, since these are the versions of dependencies that a crate depending on oasis-runtime will use (unless overridden). E.g. before this change a crate depending on oasis-runtime#master would get ring 0.16.20 version which doesn't match the ring-sgx patch version - and having an up to date Cargo.lock would catch this sooner.

@kostko
Copy link
Member

kostko commented Jun 1, 2021

Ok. While doing this, we should also update the crate versions to something other than 0.3.0-alpha. Or maybe just remove the versions and expect downstream to use git tags?

@ptrus
Copy link
Member Author

ptrus commented Jun 1, 2021

Hm yeah i think we should just remove the version for now?

@kostko
Copy link
Member

kostko commented Jun 1, 2021

Agreed, let's remove it.

@codecov
Copy link

codecov bot commented Jun 1, 2021

Codecov Report

Merging #3981 (1469aa9) into master (9963047) will decrease coverage by 0.03%.
The diff coverage is n/a.

❗ Current head 1469aa9 differs from pull request most recent head f688ec8. Consider uploading reports for the commit f688ec8 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3981      +/-   ##
==========================================
- Coverage   67.28%   67.24%   -0.04%     
==========================================
  Files         410      410              
  Lines       41828    41828              
==========================================
- Hits        28144    28129      -15     
- Misses       9727     9743      +16     
+ Partials     3957     3956       -1     
Impacted Files Coverage Δ
go/oasis-node/cmd/common/metrics/disk.go 65.38% <0.00%> (-19.24%) ⬇️
go/oasis-node/cmd/common/metrics/resource.go 78.94% <0.00%> (-10.53%) ⬇️
...nsensus/tendermint/apps/beacon/state/state_pvss.go 69.23% <0.00%> (-7.70%) ⬇️
go/consensus/tendermint/apps/registry/query.go 76.47% <0.00%> (-5.89%) ⬇️
go/common/grpc/proxy/proxy.go 65.74% <0.00%> (-5.56%) ⬇️
go/common/sgx/common.go 58.53% <0.00%> (-4.88%) ⬇️
go/consensus/tendermint/registry/registry.go 72.30% <0.00%> (-3.76%) ⬇️
go/sentry/api/grpc.go 53.44% <0.00%> (-3.45%) ⬇️
go/runtime/host/protocol/connection.go 63.52% <0.00%> (-3.28%) ⬇️
go/worker/storage/service_external.go 51.42% <0.00%> (-2.86%) ⬇️
... and 32 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9963047...f688ec8. Read the comment docs.

@ptrus ptrus force-pushed the ptrus/internal/specific-ring-version branch from 1469aa9 to f688ec8 Compare June 1, 2021 10:58
@ptrus ptrus enabled auto-merge June 1, 2021 11:05
@ptrus ptrus merged commit cfd86d5 into master Jun 1, 2021
@ptrus ptrus deleted the ptrus/internal/specific-ring-version branch June 1, 2021 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants