From eaadf56db92a51ecccbf36b289ee6848e665bbbd Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 7 Feb 2024 13:55:36 -0700
Subject: [PATCH] Testing buf breaking (#7475)

Release Notes:

- N/A
---
 .github/actions/check_style/action.yml |  6 ------
 .github/workflows/ci.yml               | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index 39601e8c25..e95c6b493a 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -22,9 +22,3 @@ runs:
           run: |
               export SQUAWK_GITHUB_TOKEN=${{ github.token }}
               . ./script/squawk
-
-        - uses: bufbuild/buf-setup-action@v1
-        - uses: bufbuild/buf-breaking-action@v1
-          with:
-              input: "crates/rpc/proto/"
-              against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ad9f57fd1..b7bde60eec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,17 @@ jobs:
             - name: Run style checks
               uses: ./.github/actions/check_style
 
+            - name: Ensure fresh merge
+              run: |
+                git checkout -B temp
+                git merge -q origin/main -m "merge main into temp"
+
+            - uses: bufbuild/buf-setup-action@v1
+            - uses: bufbuild/buf-breaking-action@v1
+              with:
+                  input: "crates/rpc/proto/"
+                  against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+
     tests:
         name: Run tests
         runs-on: