From 2b8ca659dc31cf51bf4dc0fa807ba02a0ef41430 Mon Sep 17 00:00:00 2001
From: Fraz Arshad <fraz.arshad12@gmail.com>
Date: Mon, 29 Jul 2024 15:27:12 +0500
Subject: [PATCH 1/4] ci: force rebase and autosquash before merging

---
 .mergify.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index ec397b13b8e..662c9aa3b09 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -68,6 +68,7 @@ pull_request_rules:
     conditions:
       - base=master
       - label=automerge:rebase
+      - linear-history
     actions:
       queue:
         merge_method: merge
@@ -79,3 +80,11 @@ pull_request_rules:
     actions:
       queue:
         merge_method: squash
+  - name: rebase and autosquash
+    conditions:
+      - base=master
+      - label=automerge:rebase
+      - -linear-history
+    actions:
+      rebase:
+        autosquash: true

From 33e6d00d95fe804a48de461ec9f509834f044269 Mon Sep 17 00:00:00 2001
From: Fraz Arshad <fraz.arshad12@gmail.com>
Date: Mon, 5 Aug 2024 13:31:04 +0500
Subject: [PATCH 2/4] ci: added check for fixup commits

---
 .github/workflows/check-fixup-commits.yml | 38 +++++++++++++++++++++++
 multichain-testing/README.md              |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/check-fixup-commits.yml

diff --git a/.github/workflows/check-fixup-commits.yml b/.github/workflows/check-fixup-commits.yml
new file mode 100644
index 00000000000..1e498ed5d7f
--- /dev/null
+++ b/.github/workflows/check-fixup-commits.yml
@@ -0,0 +1,38 @@
+name: Check for fixup commits
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - converted_to_draft
+      - ready_for_review
+      - labeled
+      - unlabeled
+      - auto_merge_enabled
+      - auto_merge_disabled
+
+jobs:
+  check-fixup-commits:
+    runs-on: ubuntu-latest
+
+    env:
+      HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+      BASE_SHA: ${{ github.event.pull_request.base.sha }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for fixup commits
+        id: fixup-commits
+        run: |
+          if [[ $(git rev-list "$BASE_SHA".."$HEAD_SHA" --grep="^fixup! " | wc -l) -eq 0 ]]; then
+            echo "No fixup commits found in commit history"
+          else
+            echo "Fixup commits found in commit history"
+            exit 1
+          fi
\ No newline at end of file
diff --git a/multichain-testing/README.md b/multichain-testing/README.md
index 48490edfde6..2138b9e8544 100644
--- a/multichain-testing/README.md
+++ b/multichain-testing/README.md
@@ -45,7 +45,7 @@ make port-forward
 make fund-provision-pool override-chain-registry
 ```
 
-If you get an error like "connection refused", you need to wait longer, until all the pods are Running.
+If you get an error like "connection refused", you need to wait longer, until all asdasthe pods are Running.
 
 # Cleanup
 

From 7b9d8ab08df9b69162b5d98bb34bb070018a748d Mon Sep 17 00:00:00 2001
From: Fraz Arshad <fraz.arshad12@gmail.com>
Date: Mon, 5 Aug 2024 15:21:36 +0500
Subject: [PATCH 3/4] fixup! essrror in yaml

---
 multichain-testing/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multichain-testing/README.md b/multichain-testing/README.md
index 2138b9e8544..fab67d1a5d4 100644
--- a/multichain-testing/README.md
+++ b/multichain-testing/README.md
@@ -18,7 +18,7 @@ The `agoric` software revision includes the vats necessary for building and test
 
 First, ensure you have Kubernetes available. See https://docs.cosmology.zone/starship/get-started/step-2.
 
-The following will install `kubectl`, `kind`, `helm`, and `yq` as needed.
+The followinsg will install `kubectl`, `kind`, `helm`, and `yq` as needed.
 
 ```sh
 make clean setup

From c11c7830199c9b880d4309461bf48a3ef859a5c0 Mon Sep 17 00:00:00 2001
From: Fraz Arshad <fraz.arshad12@gmail.com>
Date: Mon, 5 Aug 2024 17:26:25 +0500
Subject: [PATCH 4/4] ci: lint fix

---
 .github/workflows/check-fixup-commits.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-fixup-commits.yml b/.github/workflows/check-fixup-commits.yml
index 1e498ed5d7f..7c25b9e2f21 100644
--- a/.github/workflows/check-fixup-commits.yml
+++ b/.github/workflows/check-fixup-commits.yml
@@ -35,4 +35,4 @@ jobs:
           else
             echo "Fixup commits found in commit history"
             exit 1
-          fi
\ No newline at end of file
+          fi