Testing buf breaking (#7475)

Conrad Irwin created 2 years ago

Release Notes:

- N/A

Change summary

.github/actions/check_style/action.yml |  5 -----
.github/workflows/ci.yml               | 12 ++++++++++++
2 files changed, 12 insertions(+), 5 deletions(-)

Detailed changes

.github/actions/check_style/action.yml

@@ -23,8 +23,3 @@ runs:
         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/"

.github/workflows/ci.yml

@@ -48,6 +48,18 @@ 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: