Revert "[nrf noup] ci: NCS-specific CI tweaks"

This reverts commit 6692263.

Signed-off-by: Grzegorz Swiderski <[email protected]>

.github/workflows/compliance.yml

@@ -31,8 +31,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        #(echo "::error ::Merge commits not allowed, rebase instead";false)
+        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        (echo "::error ::Merge commits not allowed, rebase instead";false)
         rm -fr ".git/rebase-apply"
         rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
@@ -83,7 +83,7 @@ jobs:
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
         ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e ClangFormat \
-        -e Kconfig -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..
+        -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@v4

scripts/gitlint/zephyr_commit_rules.py

@@ -78,7 +78,7 @@ class TitleMaxLengthRevert(LineRule):
     name = "title-max-length-no-revert"
     id = "UC5"
     target = CommitMessageTitle
-    options_spec = [IntOption('line-length', 120, "Max line length")]
+    options_spec = [IntOption('line-length', 75, "Max line length")]
     violation_message = "Commit title exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):
@@ -103,7 +103,7 @@ class MaxLineLengthExceptions(LineRule):
     name = "max-line-length-with-exceptions"
     id = "UC4"
     target = CommitMessageBody
-    options_spec = [IntOption('line-length', 120, "Max line length")]
+    options_spec = [IntOption('line-length', 75, "Max line length")]
     violation_message = "Commit message body line exceeds max length ({0}>{1})"
 
     def validate(self, line, _commit):