From 7ff10762a6d83359474061e627b02858b68d6868 Mon Sep 17 00:00:00 2001
From: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Date: Mon, 17 Feb 2025 11:58:17 +0100
Subject: [PATCH] Revert "[nrf noup] ci: NCS-specific CI tweaks"

This reverts commit 6692263072e247f5eef7fb41bb1ee46e56fa7fbe.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
---
 .github/workflows/commit-tags.yml      | 28 --------------------------
 .github/workflows/compliance.yml       |  6 +++---
 Jenkinsfile                            |  5 -----
 scripts/gitlint/zephyr_commit_rules.py |  4 ++--
 4 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/commit-tags.yml
 delete mode 100644 Jenkinsfile

diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
deleted file mode 100644
index 828f0297167..00000000000
--- a/.github/workflows/commit-tags.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Commit tags
-
-on:
-  pull_request:
-    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
-            milestoned, demilestoned, assigned, unassigned, ready_for_review,
-            review_requested]
-
-jobs:
-  commit_tags:
-    runs-on: ubuntu-22.04
-    name: Run commit tags checks on patch series (PR)
-    steps:
-    - name: Update PATH for west
-      run: |
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-    - name: Checkout the code
-      uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-
-    - name: Run the commit tags
-      uses: nrfconnect/action-commit-tags@main
-      with:
-        target: .
-        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
index 56927365550..2ad48848fed 100644
--- a/.github/workflows/compliance.yml
+++ b/.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
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 3b9cf002239..00000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,5 +0,0 @@
-@Library("CI_LIB") _
-
-def pipeline = new ncs.sdk_zephyr.Main()
-
-pipeline.run(JOB_NAME)
diff --git a/scripts/gitlint/zephyr_commit_rules.py b/scripts/gitlint/zephyr_commit_rules.py
index ef317e22684..a2c9cd3cb7f 100644
--- a/scripts/gitlint/zephyr_commit_rules.py
+++ b/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):