From d307d438c5d9f38121c0e5aaff3ec4e4ac3db289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Test=C3=A9?= Date: Wed, 11 Jan 2023 18:56:59 +0100 Subject: [PATCH] chore(ci): move block pr merge to its own workflow --- .github/workflows/block_merge.yml | 18 ++++++++++++++++++ .github/workflows/continuous-integration.yml | 13 ------------- 2 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/block_merge.yml diff --git a/.github/workflows/block_merge.yml b/.github/workflows/block_merge.yml new file mode 100644 index 000000000..d25521f25 --- /dev/null +++ b/.github/workflows/block_merge.yml @@ -0,0 +1,18 @@ +name: Block PR merge + +on: + pull_request: + types: [opened, synchronize, reopened] + +jobs: + BlockMerge: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Check Commit to Squash + run: | + set -e + git log origin/${{ github.base_ref }}..origin/${{ github.head_ref }} --format=%s | ( ! grep -e "^f [0-9a-f]\+" -q ) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 8238cbfbf..1f4128011 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -92,19 +92,6 @@ jobs: echo "Debug: ccache statistics (after the tests):" ccache -s - BlockMerge: - if: github.event_name == 'pull_request' - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Check Commit to Squash - run: | - set -e - git log origin/${{ github.base_ref }}..origin/${{ github.head_ref }} --format=%s | ( ! grep -e "^f [0-9a-f]\+" -q ) - ################################## # Releasing and Testing Packages # ##################################