Skip to content

Commit

Permalink
Merge branch 'fraccaman/fix-queue-ci'
Browse files Browse the repository at this point in the history
* fraccaman/fix-queue-ci:
  run full ci checks on merge queue
  run full ci checks on merge queue
  • Loading branch information
Fraccaman committed Jul 30, 2024
2 parents 22bf6e7 + 3ec2b9c commit 1e21ae8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
10 changes: 1 addition & 9 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 || contains(github.ref, 'mergify/merge-queue')
timeout-minutes: 25
needs: [build-wasm]

Expand Down Expand Up @@ -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 || contains(github.ref, 'mergify/merge-queue')
needs: [build-wasm, build-binaries]
timeout-minutes: 35
strategy:
Expand Down

0 comments on commit 1e21ae8

Please sign in to comment.