Skip to content

Commit

Permalink
Merge pull request #789 from multiversx/development
Browse files Browse the repository at this point in the history
Development into main
  • Loading branch information
andreibancioiu committed Jan 3, 2024
2 parents 5b1d1ac + 6f8180c commit a1af0a6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/developers/meta/sc-meta.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You can find it on [crates.io](https://crates.io/crates/multiversx-sc-meta) [![c
To install it, simply call

```
cargo install multiversx-sc-meta
cargo install multiversx-sc-meta --locked
```

After that, try calling `sc-meta help` or `sc-meta -h` to see the CLI docs.
Expand Down
2 changes: 1 addition & 1 deletion docs/sdk-and-tools/sdk-py/configuring-mxpy.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ In order to view the current configuration, one can issue the command `mxpy conf
One can alter the current configuration using the command `mxpy config set`. For example, in order to set the **_rust version_** to be used, one would do the following:

```
$ mxpy config set dependencies.rust.tag nightly-2023-05-26
$ mxpy config set dependencies.rust.tag nightly-2023-12-11
```
16 changes: 8 additions & 8 deletions docs/sdk-and-tools/troubleshooting/rust-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ Then, choose **Proceed with installation (default)**.
Once Rust is installed, switch to a nightly version and install the `wasm32-unknown-unknown` target:

```bash
rustup default nightly-2023-05-26
rustup default nightly-2023-12-11
rustup target add wasm32-unknown-unknown
```

Afterwards, install `sc-meta`:

```bash
cargo install multiversx-sc-meta
cargo install multiversx-sc-meta --locked
```

Optionally, you may also want to install `wasm-opt` and `twiggy`:
Expand All @@ -104,9 +104,9 @@ For CI / CD, use the following:
```bash
wget -O rustup.sh https://sh.rustup.rs && \
chmod +x rustup.sh && \
./rustup.sh --verbose --default-toolchain nightly-2023-05-26 --target wasm32-unknown-unknown -y
./rustup.sh --verbose --default-toolchain nightly-2023-12-11 --target wasm32-unknown-unknown -y

cargo install multiversx-sc-meta
cargo install multiversx-sc-meta --locked
```

[comment]: # (mx-context-auto)
Expand All @@ -131,7 +131,7 @@ installed toolchains
--------------------
[...]
nightly-2023-05-26-x86_64-unknown-linux-gnu (default)
nightly-2023-12-11-x86_64-unknown-linux-gnu (default)
installed targets for active toolchain
--------------------------------------
Expand All @@ -144,19 +144,19 @@ active toolchain
----------------
[...]
nightly-2023-05-26-x86_64-unknown-linux-gnu (default)
nightly-2023-12-11-x86_64-unknown-linux-gnu (default)
```

You can also check the status of your Rust installation using `mxpy`:

```
$ mxpy deps check rust
INFO cli.deps: Checking dependency: module = rust, tag = nightly-2023-05-26
INFO cli.deps: Checking dependency: module = rust, tag = nightly-2023-12-11
INFO modules: which rustc: /home/ubuntu/.cargo/bin/rustc
INFO modules: which cargo: /home/ubuntu/.cargo/bin/cargo
INFO modules: which sc-meta: /home/ubuntu/.cargo/bin/sc-meta
INFO modules: which wasm-opt: /home/ubuntu/.cargo/bin/wasm-opt
INFO modules: which twiggy: /home/ubuntu/.cargo/bin/twiggy
INFO cli.deps: [rust nightly-2023-05-26] is installed.
INFO cli.deps: [rust nightly-2023-12-11] is installed.
```

0 comments on commit a1af0a6

Please sign in to comment.