From 3dcd1cbbc17fcfd75eb4d1d3a422a24488f25089 Mon Sep 17 00:00:00 2001
From: dadajian <dadajian@expediagroup.com>
Date: Fri, 8 May 2026 10:07:39 -0500
Subject: [PATCH 1/6] chore: mq-test-pr-5 - fail build job in merge queue

---
 .github/workflows/test.yaml | 2 +-
 README.md                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d3ac516..17febbc 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -19,7 +19,7 @@ jobs:
           echo "base_sha: ${{ github.event.merge_group.base_sha }}"
           echo "head_sha: ${{ github.event.merge_group.head_sha }}"
       - name: No-op
-        run: echo "no-op"
+        run: ${{ github.event_name == 'merge_group' && 'exit 1 &&' || '' }} echo "no-op"
 
   test:
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index a920a59..d7257cf 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # package-json-validator
 
-A Github Action for validating package.json conventions. test [MQ-TEST-3]
+A Github Action for validating package.json conventions. test [MQ-TEST-5]
 
 ## Rules
 

From 9b0fff27b42ae62aa145ef3ecd8ee3641627e361 Mon Sep 17 00:00:00 2001
From: dadajian <dadajian@expediagroup.com>
Date: Fri, 8 May 2026 10:12:13 -0500
Subject: [PATCH 2/6] chore: mq-test-pr-5 - use dedicated fail step in merge
 queue

---
 .github/workflows/test.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 17febbc..559b198 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -18,8 +18,11 @@ jobs:
         run: |
           echo "base_sha: ${{ github.event.merge_group.base_sha }}"
           echo "head_sha: ${{ github.event.merge_group.head_sha }}"
+      - name: Fail in merge queue
+        if: github.event_name == 'merge_group'
+        run: exit 1
       - name: No-op
-        run: ${{ github.event_name == 'merge_group' && 'exit 1 &&' || '' }} echo "no-op"
+        run: echo "no-op"
 
   test:
     runs-on: ubuntu-latest

From 942f137c1819f23e773a7ac8a9e06c51436cdade Mon Sep 17 00:00:00 2001
From: dadajian <dadajian@expediagroup.com>
Date: Fri, 8 May 2026 10:18:45 -0500
Subject: [PATCH 3/6] chore: mq-test-pr-5 - move fail step after no-op

---
 .github/workflows/test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 559b198..f8260b4 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -18,11 +18,11 @@ jobs:
         run: |
           echo "base_sha: ${{ github.event.merge_group.base_sha }}"
           echo "head_sha: ${{ github.event.merge_group.head_sha }}"
+      - name: No-op
+        run: echo "no-op"
       - name: Fail in merge queue
         if: github.event_name == 'merge_group'
         run: exit 1
-      - name: No-op
-        run: echo "no-op"
 
   test:
     runs-on: ubuntu-latest

From 5226b04e122180c0bb907dc126a54437f097c7ce Mon Sep 17 00:00:00 2001
From: Dan Adajian <dadajian@expediagroup.com>
Date: Fri, 8 May 2026 16:09:28 -0500
Subject: [PATCH 4/6] Update test.yaml

---
 .github/workflows/test.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f8260b4..d3ac516 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -20,9 +20,6 @@ jobs:
           echo "head_sha: ${{ github.event.merge_group.head_sha }}"
       - name: No-op
         run: echo "no-op"
-      - name: Fail in merge queue
-        if: github.event_name == 'merge_group'
-        run: exit 1
 
   test:
     runs-on: ubuntu-latest

From 6e64dbbc92bb97d3f74238fb453cbd3717ee94bd Mon Sep 17 00:00:00 2001
From: Dan Adajian <dadajian@expediagroup.com>
Date: Fri, 8 May 2026 16:18:56 -0500
Subject: [PATCH 5/6] Update test.yaml

---
 .github/workflows/test.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 62920d3..fda358a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -18,11 +18,9 @@ jobs:
         run: |
           echo "base_sha: ${{ github.event.merge_group.base_sha }}"
           echo "head_sha: ${{ github.event.merge_group.head_sha }}"
-      - name: Sleep in merge queue
-        if: github.event_name == 'merge_group'
-        run: sleep 300
+
       - name: No-op
-        run: echo "no-op"
+        run: exit 1
 
   test:
     runs-on: ubuntu-latest

From 46a04329cbd33251a74c8f0a7aadea60f30d8000 Mon Sep 17 00:00:00 2001
From: Dan Adajian <dadajian@expediagroup.com>
Date: Fri, 8 May 2026 16:24:15 -0500
Subject: [PATCH 6/6] Update test.yaml

---
 .github/workflows/test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index fda358a..fb373b1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -20,6 +20,7 @@ jobs:
           echo "head_sha: ${{ github.event.merge_group.head_sha }}"
 
       - name: No-op
+        if: github.event_name == 'merge_group'
         run: exit 1
 
   test: