run full ci checks on merge queue

anoma · Jul 30, 2024 · eaf2d39 · eaf2d39
1 parent 22bf6e7
commit eaf2d39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git 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
diff --git 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: