Skip to content

Commit

Permalink
Merge branch 'manta' into fix_lottery_withdraw
Browse files Browse the repository at this point in the history
  • Loading branch information
ferrell-code authored May 7, 2024
2 parents bfcadbf + edf4f97 commit aba0295
Show file tree
Hide file tree
Showing 127 changed files with 6,504 additions and 6,932 deletions.
1 change: 1 addition & 0 deletions .github/resources/frame-weight-template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(double_parens)]
#![allow(unused_imports)]
#![allow(missing_docs)]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/benchmark_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup update
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -93,8 +93,8 @@ jobs:
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup update
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
echo "$HOME/.local/bin" >> $GITHUB_PATH
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration_test_calamari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration_test_manta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/metadata_diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_draft_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ jobs:
rustup default stable
rustup update
rustup target add wasm32-unknown-unknown
rustup install 1.71.0
rustup target add wasm32-unknown-unknown --toolchain 1.71.0
rustup install 1.74.0
rustup target add wasm32-unknown-unknown --toolchain 1.74.0
- name: cache cargo
uses: Swatinem/rust-cache@v2
- name: build
Expand All @@ -127,7 +127,7 @@ jobs:
SCCACHE_DIR: ~/.cache/sccache
run: |
source ${HOME}/.cargo/env
RUSTC_BOOTSTRAP=1 cargo +1.71.0 build --profile production --verbose
RUSTC_BOOTSTRAP=1 cargo +1.74.0 build --profile production --verbose
- name: stop sccache server
run: sccache --stop-server || true
- if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_all_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/run_linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
cargo install taplo-cli --locked
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand All @@ -77,9 +77,10 @@ jobs:
SCCACHE_CACHE_SIZE: 2G
SCCACHE_DIR: ~/.cache/sccache
shell: bash
# It's pointless to use no-default features.
run: |
source ${HOME}/.cargo/env
SKIP_WASM_BUILD=1 cargo check --no-default-features
SKIP_WASM_BUILD=1 cargo check --all-targets --all-features
SKIP_WASM_BUILD=1 cargo clippy --all-targets --all-features -- -D warnings
- name: stop sccache server
run: sccache --stop-server || true
4 changes: 2 additions & 2 deletions .github/workflows/try-runtime-mainnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
protoc --version
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
curl -s https://sh.rustup.rs -sSf | sh -s -- -y
source ${HOME}/.cargo/env
rustup update
rustup toolchain install 1.71.0
rustup default 1.71.0
rustup toolchain install 1.74.0
rustup default 1.74.0
rustup target add wasm32-unknown-unknown
- name: cache cargo
uses: Swatinem/rust-cache@v2
Expand Down
Loading

0 comments on commit aba0295

Please sign in to comment.