From eaf2d396d26e3610e0bfed217d644c6ea0ba14aa Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Tue, 30 Jul 2024 11:48:59 +0200 Subject: [PATCH 1/2] run full ci checks on merge queue --- .config/nextest.toml | 10 +--------- .github/workflows/ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.config/nextest.toml b/.config/nextest.toml index 759047cda0..cafb3077e8 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -2,13 +2,5 @@ retries = 0 [[profile.default.overrides]] -filter = 'test(=e2e::ledger_tests::double_signing_gets_slashed)' -retries = 2 - -[[profile.default.overrides]] -filter = 'test(=e2e::ibc_tests::ibc_namada_gaia)' -retries = 2 - -[[profile.default.overrides]] -filter = 'test(=e2e::ledger_tests::pos_init_validator)' +filter = 'test(e2e::)' retries = 2 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca28331230..b7408a6aab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -362,7 +362,7 @@ jobs: runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86] container: image: ghcr.io/heliaxdev/namada-ci:namada-main - if: github.event.pull_request.draft == false + if: github.event.pull_request.draft == false || startsWith(github.ref, 'mergify/merge-queue') timeout-minutes: 25 needs: [build-wasm] @@ -473,7 +473,7 @@ jobs: runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86] container: image: ghcr.io/heliaxdev/namada-ci:namada-main - if: github.event.pull_request.draft == false + if: github.event.pull_request.draft == false || startsWith(github.ref, 'mergify/merge-queue') needs: [build-wasm, build-binaries] timeout-minutes: 35 strategy: From 3ec2b9c1d48b04e875bf075187e6d202133a1468 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Tue, 30 Jul 2024 11:52:18 +0200 Subject: [PATCH 2/2] run full ci checks on merge queue --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7408a6aab..b8414cb563 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -362,7 +362,7 @@ jobs: runs-on: [self-hosted, 8vcpu-16ram-ubuntu22-namada-x86] container: image: ghcr.io/heliaxdev/namada-ci:namada-main - if: github.event.pull_request.draft == false || startsWith(github.ref, 'mergify/merge-queue') + if: github.event.pull_request.draft == false || contains(github.ref, 'mergify/merge-queue') timeout-minutes: 25 needs: [build-wasm] @@ -473,7 +473,7 @@ jobs: runs-on: [self-hosted, 4vcpu-8ram-ubuntu22-namada-x86] container: image: ghcr.io/heliaxdev/namada-ci:namada-main - if: github.event.pull_request.draft == false || startsWith(github.ref, 'mergify/merge-queue') + if: github.event.pull_request.draft == false || contains(github.ref, 'mergify/merge-queue') needs: [build-wasm, build-binaries] timeout-minutes: 35 strategy: