ci: prevent merge-requests in a PR

JohnVillalovos · JohnVillalovos · commit 9f52e07c609b · 2024-01-27T18:42:48.000-08:00
Have the CI prevent merge-requests being part of a PR
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -41,3 +41,20 @@ 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)
+        run: |
+          set -x
+          echo "event name is: ${{ github.event_name }}"
+          git --version
+          git log --oneline | head
+          echo "GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME}"
+          echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}"
+          echo "GITHUB_SHA: ${GITHUB_SHA}"
+          echo "github.event.pull_request.head.sha: ${{ github.event.pull_request.head.sha }}"
+          HEAD_SHA="${{ github.event.pull_request.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
+        if: github.event_name == 'pull_request'
