From 6df9f912720262a9f6d0cc7896ca0864a8f7fac7 Mon Sep 17 00:00:00 2001 From: mcamou Date: Tue, 12 Aug 2025 19:55:27 +0200 Subject: [PATCH 1/2] Add DO NOT MERGE / FIXME test for merging --- .github/workflows/tests.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ad34dad..d8135e3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -52,3 +52,16 @@ jobs: - name: Run unit tests run: | go test ./... + + ready-to-merge: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Verify that merging is OK + run: | + if grep -rE 'DO[ ]NOT[ ]MERGE|[F]IXME' .; then + exit 1 + fi From e2e1f30e1d242353236c44e6d7baa74d5def2e3f Mon Sep 17 00:00:00 2001 From: mcamou Date: Tue, 12 Aug 2025 20:00:56 +0200 Subject: [PATCH 2/2] Add space before FIXME --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d8135e3..3e6b924 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -62,6 +62,6 @@ jobs: - name: Verify that merging is OK run: | - if grep -rE 'DO[ ]NOT[ ]MERGE|[F]IXME' .; then + if grep -rE 'DO[ ]NOT[ ]MERGE|[ ]FIXME' .; then exit 1 fi