From 2578955575a07fcb8ca4412dc4a525bf82e5f05a Mon Sep 17 00:00:00 2001 From: zi0Black <13380579+zi0Black@users.noreply.github.com> Date: Thu, 23 May 2024 14:38:04 +0200 Subject: [PATCH 1/5] (fix) Reorder the parameters and adapt them to Nextest. --- .github/workflows/coverage-move-only.yaml | 2 +- .github/workflows/coverage.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage-move-only.yaml b/.github/workflows/coverage-move-only.yaml index 6e4748b935487..a5c0a023b5767 100644 --- a/.github/workflows/coverage-move-only.yaml +++ b/.github/workflows/coverage-move-only.yaml @@ -50,7 +50,7 @@ jobs: with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 - - run: cargo llvm-cov nextest --ignore-run-fail -p aptos-framework -p "move*" --lcov --jobs 32 --output-path lcov_unit.info + - run: cargo llvm-cov nextest --lcov --output-path lcov_unit.info --ignore-run-fail -p aptos-framework -p "move*" env: INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres - uses: actions/upload-artifact@v3 diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 8be7b89e87708..d4ee422ff32c6 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -38,7 +38,7 @@ jobs: with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 - - run: cargo llvm-cov nextest --ignore-run-fail --workspace --exclude smoke-test --exclude aptos-testcases --lcov --jobs 32 --output-path lcov_unit.info -vv + - run: cargo llvm-cov nextest --lcov --output-path lcov_unit.info -vv --ignore-run-fail --workspace --exclude smoke-test --exclude aptos-testcases env: INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres RUST_MIN_STACK: 33554432 # 32 MB of stack @@ -69,7 +69,7 @@ jobs: with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 - - run: cargo llvm-cov nextest --ignore-run-fail --package smoke-test --lcov --output-path lcov_smoke.info -vv + - run: cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --no-fail-fast -p smoke-test env: INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres RUST_MIN_STACK: 33554432 From 74bcf587fb1bec451f8c294d474d092222b0fc20 Mon Sep 17 00:00:00 2001 From: zi0Black <13380579+zi0Black@users.noreply.github.com> Date: Thu, 23 May 2024 21:01:52 +0200 Subject: [PATCH 2/5] Bump taiki-e/install-action to 2.33.28 (pinned) --- .github/workflows/coverage-move-only.yaml | 2 +- .github/workflows/coverage.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage-move-only.yaml b/.github/workflows/coverage-move-only.yaml index a5c0a023b5767..5f6ab8bd013ed 100644 --- a/.github/workflows/coverage-move-only.yaml +++ b/.github/workflows/coverage-move-only.yaml @@ -46,7 +46,7 @@ jobs: echo "/home/runner/.dotnet" | tee -a $GITHUB_PATH echo "/home/runner/.dotnet/tools" | tee -a $GITHUB_PATH - run: rustup component add llvm-tools-preview - - uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6 + - uses: taiki-e/install-action@4fedbddde88aab767a45a011661f832d68202716 # pin@v2.33.28 with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index d4ee422ff32c6..40916ddbe231b 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -34,7 +34,7 @@ jobs: fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it. - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main - run: rustup component add llvm-tools-preview - - uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6 + - uses: taiki-e/install-action@4fedbddde88aab767a45a011661f832d68202716 # pin@v2.33.28 with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 @@ -65,7 +65,7 @@ jobs: fetch-depth: 0 # get all the history because cargo xtest --change-since origin/main requires it. - uses: aptos-labs/aptos-core/.github/actions/rust-setup@main - run: rustup component add llvm-tools-preview - - uses: taiki-e/install-action@6f1ebcd9e21315fc37d7f7bc851dfcc8356d7da3 # pin@v1.5.6 + - uses: taiki-e/install-action@4fedbddde88aab767a45a011661f832d68202716 # pin@v2.33.28 with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 From 77b2153ba1e33259112cdac252e53e7bab474188 Mon Sep 17 00:00:00 2001 From: zi0Black <13380579+zi0Black@users.noreply.github.com> Date: Fri, 24 May 2024 12:11:56 +0200 Subject: [PATCH 3/5] Smoke test switch to "--ignore-run-fail" to ensure lcov file creation --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 40916ddbe231b..6bea14708af51 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -69,7 +69,7 @@ jobs: with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 - - run: cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --no-fail-fast -p smoke-test + - run: cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --ignore-run-fail -p smoke-test env: INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres RUST_MIN_STACK: 33554432 From 9e2d5ef443de0898684650fe8b9004d9af782eed Mon Sep 17 00:00:00 2001 From: zi0Black <13380579+zi0Black@users.noreply.github.com> Date: Fri, 24 May 2024 16:46:50 +0200 Subject: [PATCH 4/5] Smoke test adapt to required build --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 6bea14708af51..2a00d12fde4ae 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -69,7 +69,7 @@ jobs: with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 - - run: cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --ignore-run-fail -p smoke-test + - run: cargo build --locked --package=aptos-node --features=failpoints,indexer --release && LOCAL_SWARM_NODE_RELEASE=1 cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --ignore-run-fail -p smoke-test env: INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres RUST_MIN_STACK: 33554432 From 74a26cc0da9c81b29aa7a3b3380adf931e27a184 Mon Sep 17 00:00:00 2001 From: zi0Black <13380579+zi0Black@users.noreply.github.com> Date: Tue, 28 May 2024 16:32:40 +0200 Subject: [PATCH 5/5] Smoke test new flags --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 2a00d12fde4ae..1f844330d3e30 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -69,7 +69,7 @@ jobs: with: tool: nextest,cargo-llvm-cov - run: docker run --detach -p 5432:5432 cimg/postgres:14.2 - - run: cargo build --locked --package=aptos-node --features=failpoints,indexer --release && LOCAL_SWARM_NODE_RELEASE=1 cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --ignore-run-fail -p smoke-test + - run: cargo build --locked --package=aptos-node --features=failpoints,indexer --release && LLVM_PROFDATA_FLAGS="--failure-mode=all" LOCAL_SWARM_NODE_RELEASE=1 cargo llvm-cov nextest --lcov --output-path lcov_smoke.info -vv --ignore-run-fail --profile smoke-test -p smoke-test env: INDEXER_DATABASE_URL: postgresql://postgres@localhost/postgres RUST_MIN_STACK: 33554432