Skip to content

Commit

Permalink
Merge pull request #1379 from KeystoneHQ/update-toolchain
Browse files Browse the repository at this point in the history
chore: update toolchain
  • Loading branch information
ww3512687 authored Oct 9, 2024
2 parents 439dfed + 5721e7e commit 241973f
Show file tree
Hide file tree
Showing 76 changed files with 330 additions and 199 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust-aptos-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/aptos
run: cd rust/apps/aptos && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/aptos && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-arweave-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/arweave
run: cd rust/apps/arweave && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/arweave && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-bitcoin-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/bitcoin
run: cd rust/apps/bitcoin && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/bitcoin && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-cardano-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/cardano
run: cd rust/apps/cardano && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/cardano && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-cosmos-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/cosmos
run: cd rust/apps/cosmos && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/cosmos && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-ethereum-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/ethereum
run: cd rust/apps/ethereum && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/ethereum && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
34 changes: 17 additions & 17 deletions .github/workflows/rust-fmt-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,40 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
target: x86_64-apple-darwin
components: rustfmt

- name: Run rust/apps/bitcoin
run: cd rust/apps/bitcoin && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/bitcoin && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/ethereum
run: cd rust/apps/ethereum && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/ethereum && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/solana
run: cd rust/apps/solana && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/solana && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/cardano
run: cd rust/apps/cardano && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/cardano && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/tron
run: cd rust/apps/tron && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/tron && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/near
run: cd rust/apps/near && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/near && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/xrp
run: cd rust/apps/xrp && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/xrp && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/cosmos
run: cd rust/apps/cosmos && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/cosmos && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/aptos
run: cd rust/apps/aptos && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/aptos && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/sui
run: cd rust/apps/sui && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/sui && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/arweave
run: cd rust/apps/arweave && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/arweave && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/stellar
run: cd rust/apps/stellar && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/stellar && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/utils
run: cd rust/apps/utils && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/utils && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/apps/wallets
run: cd rust/apps/wallets && cargo +nightly-2023-06-26 fmt --check
run: cd rust/apps/wallets && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/keystore
run: cd rust/keystore && cargo +nightly-2023-06-26 fmt --check
run: cd rust/keystore && cargo +nightly-2023-12-01 fmt --check
- name: Run rust/rust_c
run: cd rust/rust_c && cargo +nightly-2023-06-26 fmt --check
run: cd rust/rust_c && cargo +nightly-2023-12-01 fmt --check
4 changes: 2 additions & 2 deletions .github/workflows/rust-keystore-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/keystore
run: cd rust/keystore && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/keystore && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-near-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/near
run: cd rust/apps/near && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/near && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-solana-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/solana
run: cd rust/apps/solana && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/solana && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-stellar-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/stellar
run: cd rust/apps/stellar && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/stellar && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-sui-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/sui
run: cd rust/apps/sui && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/sui && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-ton-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/ton
run: cd rust/apps/ton && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/ton && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-tron-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/tron
run: cd rust/apps/tron && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/tron && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-utils-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/utils
run: cd rust/apps/utils && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/utils && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-wallets-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/wallets
run: cd rust/apps/wallets && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/wallets && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
4 changes: 2 additions & 2 deletions .github/workflows/rust-xrp-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-06-26
toolchain: nightly-2023-12-01
override: true
components: rustfmt
target: x86_64-apple-darwin
Expand All @@ -24,4 +24,4 @@ jobs:
uses: taiki-e/install-action@cargo-llvm-cov

- name: Run rust/apps/xrp
run: cd rust/apps/xrp && cargo +nightly-2023-06-26 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
run: cd rust/apps/xrp && cargo +nightly-2023-12-01 llvm-cov --fail-under-functions 50 --fail-under-lines 50 --fail-under-regions 50
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ RUN apt-get install -y \
RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
ENV PATH=/root/.cargo/bin:$PATH
RUN cargo install cbindgen bindgen-cli
RUN rustup install nightly-2023-06-26
RUN rustup default nightly-2023-06-26
RUN rustup target add thumbv7em-none-eabihf --toolchain nightly-2023-06-26
RUN rustup install nightly-2023-12-01
RUN rustup default nightly-2023-12-01
RUN rustup target add thumbv7em-none-eabihf --toolchain nightly-2023-12-01
RUN pip3 install PyYaml

FROM base as pillar
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ brew install armmbed/formulae/arm-none-eabi-gcc

# Install Rust
# For instructions, visit https://www.rust-lang.org/tools/install
rustup install nightly-2023-06-26
rustup install nightly-2023-12-01
rustup target add thumbv7em-none-eabihf
cargo install bindgen-cli
cargo install cbindgen
Expand Down
2 changes: 1 addition & 1 deletion docs/SIMULATOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ We recommend creating a virtual env for this project: https://docs.python.org/3/
Please follow Rust official site: https://www.rust-lang.org/tools/install

We have fixed the rust version in most of our rust libs so please run this command when you finish rust setup:
> rustup install nightly-2023-06-26
> rustup install nightly-2023-12-01
`cbindgen` is also required to build essential C header files for Rust libs, so run the following after rust setup:
> cargo install cbindgen
Expand Down
2 changes: 1 addition & 1 deletion keystone3-firmware-release
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2023-06-26
nightly-2023-12-01
10 changes: 6 additions & 4 deletions rust/apps/aptos/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/apps/aptos/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly
nightly-2023-12-01
Loading

0 comments on commit 241973f

Please sign in to comment.