commit b07dd1083aecc6682dc377b2c90dd0fb9230c622
author Gavin D'souza <gavin18d@gmail.com> Mon Jul 04 11:11:14 2022 +0530
committer Gavin D'souza <gavin18d@gmail.com> Mon Jul 25 11:54:49 2022 +0530
tree 7f96886a713577071f05037552987492fafd5c46
parent 9439a7fd304937304c0eba9a8df49321566be91b

ci: Check for conflicts & valid python in early separate step

.github/workflows/server-tests-mariadb.yml

diff --git a/.github/workflows/server-tests-mariadb.yml b/.github/workflows/server-tests-mariadb.yml
index f65cb46..64134bc 100644
--- a/.github/workflows/server-tests-mariadb.yml
+++ b/.github/workflows/server-tests-mariadb.yml
@@ -61,6 +61,14 @@
         with:
           python-version: '3.10'
 
+      - name: Check for valid Python & Merge Conflicts
+        run: |
+          python -m compileall -f "${GITHUB_WORKSPACE}"
+          if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
+              then echo "Found merge conflicts"
+              exit 1
+          fi
+
       - name: Setup Node
         uses: actions/setup-node@v2
         with: