ci: prevent merge-commits in a PR

JohnVillalovos · JohnVillalovos · commit e73506ee67f8 · 2024-01-27T18:58:16.000-08:00
Have the CI prevent merge-commits being part of a PR
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -41,3 +41,14 @@ jobs:
         run: tox -e isort -- --check
       - name: Run pylint Python code static checker (https://github.com/PyCQA/pylint)
         run: tox -e pylint
+      - name: Ensure no merge-commits in the Pull Request (PR)
+        if: github.event_name == 'pull_request'
+        run: |
+          HEAD_SHA="${{ github.event.pull_request.head.sha }}"
+          echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}"
+          echo "HEAD_SHA: ${HEAD_SHA}"
+          MERGE_COMMITS=$(git rev-list --merges origin/${GITHUB_BASE_REF}..${HEAD_SHA})
+          if [[ -n "${MERGE_COMMITS}" ]]; then
+            echo "ERROR: The Pull Request (PR) contains a 'merge commit': ${MERGE_COMMITS}"
+            exit 1
+          fi
