Use --locked for cargo commands && change Cargo.toml to use crates.io
#344
Conversation
…or cargo everywhere.
Cargo.toml
Outdated
There was a problem hiding this comment.
I was unable to use version for Scrypto crates since radix-engine-toolkit-common was not on crates.io
| @@ -53,7 +53,7 @@ impl Mnemonic { | |||
| let language = internal.language(); | |||
|
|
|||
| let words = internal | |||
| .word_iter() | |||
| .words() | |||
There was a problem hiding this comment.
word_iter method was deprecated.
scripts/ios/build-sargon.sh
Outdated
There was a problem hiding this comment.
Witness:
- I've added
--lockedto all threecargo buildcommands (iOS device, iOS sim, macOS Apple Silicon) - I've added
--lockedtocargo run sargon-bindgenfor iOS
There was a problem hiding this comment.
Witness:
- I've added
--lockedto thecargo buildcommand for Kotlin - I've added
--lockedtocargo run sargon-bindgenfor Kotlin (in filejvm/sargon-android/build.gradle.ktsbelow)
There was a problem hiding this comment.
Witness - I've added --locked to:
-
cargo check -
cargo fmt- did not work, so not added. -
cargo clippy -
cargo run nextest
There was a problem hiding this comment.
Witness - iOS workflow does not perform any cargo command, it only calls scripts/ios/build-sargon.sh which has been modified.
There was a problem hiding this comment.
Witness - Android workflow does not perform any cargo command, it only calls gradle which has been modified. (both CargoDesktopPlugkin.kt). Hmm @micbakos-rdx there is no corresponding "CargoAndroidPlugin.kt" right? We use CargoDesktopPlugkin.kt for Android too right?
| @@ -137,7 +137,7 @@ jobs: | |||
| components: rustfmt | |||
|
|
|||
| - name: Check formatting | |||
| run: cargo fmt --check | |||
| run: cargo fmt --check --all | |||
There was a problem hiding this comment.
--locked did not work for cargo fmt, so skipped that, but added --all for symmetry (I think I've previously asserted that it was not needed?)
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #344 +/- ##
=======================================
Coverage 92.84% 92.84%
=======================================
Files 1160 1160
Lines 25797 25797
Branches 85 85
=======================================
Hits 23952 23952
Misses 1834 1834
Partials 11 11
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
CyonAlexRDX
force-pushed
the
ac/cargo_version_ci_locked
branch
from
fc0d5c1 to
d4d19c2
Compare
Also rename github worksflows file names which were confusing.
For more context see Slack.
I think I've updated all
cargocommands, but please review that, especially @micbakos-rdx for the gradle files.I've also switched to using
default-features = falseeverywhere