Merge branch 'fraccaman/mergify-fix-queue'

* fraccaman/mergify-fix-queue: ci: fix mergify queue
anoma · Jul 30, 2024 · ee68f85 · ee68f85
2 parents 63e81bb + 9122fa0
commit ee68f85
Showing 1 changed file with 2 additions and 2 deletions.
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 || contains(github.ref, 'mergify/merge-queue')
+    if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, '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 || contains(github.ref, 'mergify/merge-queue')
+    if: github.event.pull_request.draft == false || contains(github.head_ref, 'mergify/merge-queue') || contains(github.ref_name, 'mergify/merge-queue')
     needs: [build-wasm, build-binaries]
     timeout-minutes: 35
     strategy: