diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml index 61c73cfcf..ce50f5641 100644 --- a/.github/workflows/lints.yml +++ b/.github/workflows/lints.yml @@ -1,6 +1,14 @@ # See: https://github.com/actions-rs/example/blob/master/.github/workflows/nightly_lints.yml --- -on: [push, pull_request] +on: + push: + branches: + - master + - develop + pull_request: + branches: + - "*" + name: Lints jobs: fmt: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9566dbd90..89a3edf96 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,13 @@ --- -on: [push, pull_request] +on: + push: + branches: + - master + - develop + pull_request: + branches: + - "*" + name: Tests jobs: test: @@ -15,10 +23,8 @@ jobs: run: | cache-util restore cargo_git cargo_registry sccache yarn_cache cache-util restore aurora-engine-target@${{ matrix.net }}net@${{ hashFiles('**/Cargo.lock') }}:target - - run: rm -rf target/solidity_build/ - - run: make ${{ matrix.net }}net-test-build - - name: Run ${{ matrix.net }}net cargo test - run: cargo test --locked --verbose --features ${{ matrix.net }}net-test + - run: make test-${{ matrix.net }}net +# - run: rm -rf target/solidity_build/ - name: Save cache run: | cache-util save cargo_git cargo_registry sccache yarn_cache @@ -33,9 +39,9 @@ jobs: run: | cache-util restore cargo_git cargo_registry sccache yarn_cache cache-util restore aurora-engine-target@bully@${{ hashFiles('**/Cargo.lock') }}:target - - run: rm -rf target/solidity_build/ - run: make mainnet-debug evm-bully=yes - run: ls -lH mainnet-debug.wasm +# - run: rm -rf target/solidity_build/ - name: Save cache run: | cache-util save cargo_git cargo_registry sccache yarn_cache diff --git a/Cargo.lock b/Cargo.lock index 1d5492cde..d6d2c4c15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,7 +115,7 @@ dependencies = [ [[package]] name = "aurora-engine" -version = "1.5.0" +version = "1.6.0" dependencies = [ "aurora-bn", "base64 0.13.0", diff --git a/etc/state-migration-test/Cargo.lock b/etc/state-migration-test/Cargo.lock index eaf655a5e..bfb0aedf8 100644 --- a/etc/state-migration-test/Cargo.lock +++ b/etc/state-migration-test/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "aurora-engine" -version = "1.5.0" +version = "1.6.0" dependencies = [ "aurora-bn", "base64",