Skip to content

Commit

Permalink
Merge #5038
Browse files Browse the repository at this point in the history
5038: feat-2.0 to dev r=EdHastingsCasperAssociation a=EdHastingsCasperAssociation

This PR merges the 2.0 feature branch to the dev branch.


Co-authored-by: Maciej Wójcik <[email protected]>
Co-authored-by: casperlabs-bors-ng[bot] <82463608+casperlabs-bors-ng[bot]@users.noreply.github.com>
Co-authored-by: Karan Dhareshwar <[email protected]>
Co-authored-by: Michał Papierski <[email protected]>
Co-authored-by: Jakub Zajkowski <[email protected]>
Co-authored-by: igor-casper <[email protected]>
Co-authored-by: igor-casper <[email protected]>
Co-authored-by: Alexander Limonov <[email protected]>
  • Loading branch information
8 people authored Dec 21, 2024
2 parents cb932c5 + 91fbb87 commit 18955ae
Show file tree
Hide file tree
Showing 1,580 changed files with 206,079 additions and 132,747 deletions.
6 changes: 5 additions & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ steps:
environment:
SCCACHE_S3_PUBLIC: true
commands:
- make check-std-features
- make check-testing-features
- make test CARGO_FLAGS=--release
- make test-contracts CARGO_FLAGS=--release
- cachepot --show-stats
Expand All @@ -48,6 +50,8 @@ steps:
- name: cargo-test-push
<<: *buildenv
commands:
- make check-std-features
- make check-testing-features
- make test CARGO_FLAGS=--release
- make test-contracts CARGO_FLAGS=--release
- cachepot --show-stats
Expand Down Expand Up @@ -517,4 +521,4 @@ volumes:
temp: {}

trigger:
cron: [ nightly-tests-cron ]
cron: [ nightly-tests-cron, feat-2-0 ]
12 changes: 12 additions & 0 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
id: nightly-toolchain
run: echo "::set-output name=version::$(cat smart_contracts/rust-toolchain)"

- name: Get nightly toolchain for docs
id: nightly-toolchain-doc
run: echo "::set-output name=version::nightly-2024-01-01"

- name: Get stable from rust-toolchain.toml
id: stable-toolchain
run: echo "::set-output name=version::$(sed -nr 's/channel\s+=\s+\"(.*)\"/\1/p' rust-toolchain.toml)"
Expand All @@ -56,6 +60,14 @@ jobs:
components: rustfmt, clippy
target: wasm32-unknown-unknown

- name: Install Toolchain - Nightly for docs
uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #tag v1.0.7
with:
profile: minimal
toolchain: ${{ steps.nightly-toolchain-doc.outputs.version }}
components: rustfmt, clippy
target: wasm32-unknown-unknown

- uses: Swatinem/rust-cache@v1

- name: fmt
Expand Down
14 changes: 6 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ resources/production/*.wasm
resources/node-storage/*
resources/local/chainspec.toml

execution_engine_testing/test_support/resources/chainspec.toml

# CLion
.idea/
cmake-build-debug/
Expand All @@ -141,14 +143,6 @@ cmake-build-debug/
.vscode/
.dccache

# NCTL transient assets
/utils/nctl/assets
/utils/nctl/remotes
/utils/nctl/stages
/utils/nctl/dumps
/utils/nctl/tmp
/utils/nctl/overrides

# utils data dirs
/utils/**/chain-download
/utils/**/lmdb-data
Expand All @@ -169,3 +163,7 @@ notes
.lh/*

*.patch

# direnv-related files
.envrc
.direnv/
Loading

0 comments on commit 18955ae

Please sign in to comment.