From ca787d72e373729aa66aea97f4ff787327513d7a Mon Sep 17 00:00:00 2001 From: Dmitry Strokov Date: Fri, 23 Jul 2021 03:17:50 +0300 Subject: [PATCH 1/4] Parallelize test suits --- .github/workflows/tests.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e058a930f..c6eff9d33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,10 @@ on: [push, pull_request] name: Tests jobs: test: - name: Test suite + strategy: + matrix: + net: [main, test, beta] + name: Test suite (${{ matrix.net }}net) runs-on: self-hosted steps: - name: Clone the repository @@ -14,15 +17,9 @@ jobs: rm -rf target && mkdir target ln -s ~/build-cache/aurora-engine/debug/ target/debug ln -s ~/build-cache/aurora-engine/release/ target/release - - run: make mainnet-test-build - - run: make testnet-test-build - - run: make betanet-test-build - - name: Run mainnet cargo test - run: cargo test --locked --verbose --features mainnet-test - - name: Run testnet cargo test - run: cargo test --locked --verbose --features testnet-test - - name: Run betanet cargo test - run: cargo test --locked --verbose --features betanet-test + - run: make ${{ matrix.net }}net-test-build + - name: Run ${{ matrix.net }}net cargo test + run: cargo test --locked --verbose --features ${{ matrix.net }}net-test bully-build: name: Bully build runs-on: self-hosted From 24e9e423c568396ec3e2bfe2a74fe6c4ed7aa454 Mon Sep 17 00:00:00 2001 From: Dmitry Strokov Date: Fri, 23 Jul 2021 03:39:26 +0300 Subject: [PATCH 2/4] Copy target instead of symlink --- .github/workflows/tests.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c6eff9d33..894f779a8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,13 +13,15 @@ jobs: uses: actions/checkout@v2 - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Prepare target directory - run: | - rm -rf target && mkdir target - ln -s ~/build-cache/aurora-engine/debug/ target/debug - ln -s ~/build-cache/aurora-engine/release/ target/release + run: rm -rf target && cp -r ~/build-cache/aurora-engine target - run: make ${{ matrix.net }}net-test-build - name: Run ${{ matrix.net }}net cargo test run: cargo test --locked --verbose --features ${{ matrix.net }}net-test + - name: Cache and clear target directory + run: | + mv -n target/debug/* ~/build-cache/aurora-engine/debug + mv -n target/release/* ~/build-cache/aurora-engine/release + rm -rf target bully-build: name: Bully build runs-on: self-hosted @@ -29,12 +31,14 @@ jobs: uses: actions/checkout@v2 - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Prepare target directory - run: | - rm -rf target && mkdir target - ln -s ~/build-cache/aurora-engine-bully/debug/ target/debug - ln -s ~/build-cache/aurora-engine-bully/release/ target/release + run: rm -rf target && cp -r ~/build-cache/aurora-engine target - run: make mainnet-debug evm-bully=yes - run: ls -lH mainnet-debug.wasm + - name: Cache and clear target directory + run: | + mv -n target/debug/* ~/build-cache/aurora-engine/debug + mv -n target/release/* ~/build-cache/aurora-engine/release + rm -rf target env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: 0 From 6a127dd5c4c98e82e093c5c058a24aa27e61ca98 Mon Sep 17 00:00:00 2001 From: Dmitry Strokov Date: Fri, 23 Jul 2021 16:42:57 +0300 Subject: [PATCH 3/4] Disable target caching --- .github/workflows/tests.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 894f779a8..8ab916675 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,16 +12,11 @@ jobs: - name: Clone the repository uses: actions/checkout@v2 - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - - name: Prepare target directory - run: rm -rf target && cp -r ~/build-cache/aurora-engine target + - name: Clean target directory + run: rm -rf target - run: make ${{ matrix.net }}net-test-build - name: Run ${{ matrix.net }}net cargo test run: cargo test --locked --verbose --features ${{ matrix.net }}net-test - - name: Cache and clear target directory - run: | - mv -n target/debug/* ~/build-cache/aurora-engine/debug - mv -n target/release/* ~/build-cache/aurora-engine/release - rm -rf target bully-build: name: Bully build runs-on: self-hosted @@ -30,15 +25,10 @@ jobs: - name: Clone the repository uses: actions/checkout@v2 - run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - - name: Prepare target directory - run: rm -rf target && cp -r ~/build-cache/aurora-engine target + - name: Clean target directory + run: rm -rf target - run: make mainnet-debug evm-bully=yes - run: ls -lH mainnet-debug.wasm - - name: Cache and clear target directory - run: | - mv -n target/debug/* ~/build-cache/aurora-engine/debug - mv -n target/release/* ~/build-cache/aurora-engine/release - rm -rf target env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: 0 From b1f60c3ee79c2d19ad5a90b73203c9964f68cf9a Mon Sep 17 00:00:00 2001 From: Dmitry Strokov Date: Fri, 23 Jul 2021 16:57:08 +0300 Subject: [PATCH 4/4] Remove dependency of bully build to test jobs --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8ab916675..54fb85bf9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,6 @@ jobs: bully-build: name: Bully build runs-on: self-hosted - needs: test steps: - name: Clone the repository uses: actions/checkout@v2