buildsys: Add new sanity check category 'checkmerge' in makefile.

Author: heinezen

Makefile

@@ -128,22 +128,26 @@ mrproperer: mrproper
 checkfast:
 	python3 -m buildsystem.codecompliance --fast
 
-.PHONY: checkall
-checkall:
-	python3 -m buildsystem.codecompliance --all
+.PHONY: checkmerge
+checkmerge:
+	python3 -m buildsystem.codecompliance --merge
 
 .PHONY: checkchanged
 checkchanged:
-	python3 -m buildsystem.codecompliance --all --only-changed-files=origin/master
+	python3 -m buildsystem.codecompliance --merge --only-changed-files=origin/master
 
 .PHONY: checkuncommited
 checkuncommited:
-	python3 -m buildsystem.codecompliance --all --only-changed-files=HEAD
+	python3 -m buildsystem.codecompliance --merge --only-changed-files=HEAD
 
 .PHONY: checkpy
 checkpy:
 	python3 -m buildsystem.codecompliance --pystyle --pylint
 
+.PHONY: checkall
+checkall:
+	python3 -m buildsystem.codecompliance --all
+
 .PHONY: help
 help: $(BUILDDIR)/Makefile
 	@echo "openage Makefile"

buildsystem/codecompliance/__main__.py

@@ -1,4 +1,4 @@
-# Copyright 2014-2024 the openage authors. See copying.md for legal info.
+# Copyright 2014-2025 the openage authors. See copying.md for legal info.
 
 """
 Entry point for the code compliance checker.
@@ -18,16 +18,24 @@ def parse_args():
     """ Returns the raw argument namespace. """
 
     cli = argparse.ArgumentParser()
-    cli.add_argument("--fast", action="store_true",
-                     help="do all checks that can be performed quickly")
-    cli.add_argument("--all", action="store_true",
-                     help="do all checks, even the really slow ones")
+    check_types = cli.add_mutually_exclusive_group()
+    check_types.add_argument("--fast", action="store_true",
+                             help="do all checks that can be performed quickly")
+    check_types.add_argument("--merge", action="store_true",
+                             help="do all checks that are required before merges to master")
+    check_types.add_argument("--all", action="store_true",
+                             help="do all checks, even the really slow ones")
+
     cli.add_argument("--only-changed-files", metavar='GITREF',
                      help=("slow checks are only done on files that have "
                            "changed since GITREF."))
     cli.add_argument("--authors", action="store_true",
                      help=("check whether all git authors are in copying.md. "
                            "repo must be a git repository."))
+    cli.add_argument("--clang-tidy", action="store_true",
+                     help=("Check the C++ code with clang-tidy. Make sure you have build the "
+                           "project with ./configure --clang-tidy or have set "
+                           "CMAKE_CXX_CLANG_TIDY for your CMake build."))
     cli.add_argument("--cppstyle", action="store_true",
                      help="check the cpp code style")
     cli.add_argument("--cython", action="store_true",
@@ -57,8 +65,6 @@ def parse_args():
                      help="increase program verbosity")
     cli.add_argument("-q", "--quiet", action="count", default=0,
                      help="decrease program verbosity")
-    cli.add_argument("--clangtidy", action="store_true",
-                    help="Check the C++ code with clang-tidy.")
 
     args = cli.parse_args()
     process_args(args, cli.error)
@@ -78,7 +84,7 @@ def process_args(args, error):
     # set up log level
     log_setup(args.verbose - args.quiet)
 
-    if args.fast or args.all:
+    if args.fast or args.merge or args.all:
         # enable "fast" tests
         args.authors = True
         args.cppstyle = True
@@ -88,17 +94,19 @@ def process_args(args, error):
         args.filemodes = True
         args.textfiles = True
 
-    if args.all:
-        # enable tests that take a bit longer
-
+    if args.merge or args.all:
+        # enable tests that are required before merging to master
         args.pystyle = True
         args.pylint = True
         args.test_git_change_years = True
-        args.clangtidy = True
+
+    if args.all:
+        # enable tests that take a bit longer
+        args.clang_tidy = True
 
     if not any((args.headerguards, args.legal, args.authors, args.pystyle,
                 args.cppstyle, args.cython, args.test_git_change_years,
-                args.pylint, args.filemodes, args.textfiles, args.clangtidy)):
+                args.pylint, args.filemodes, args.textfiles, args.clang_tidy)):
         error("no checks were specified")
 
     has_git = bool(shutil.which('git'))
@@ -130,7 +138,8 @@ def process_args(args, error):
     if args.pylint:
         if not importlib.util.find_spec('pylint'):
             error("pylint python module required for linting")
-    if args.clangtidy:
+
+    if args.clang_tidy:
         if not shutil.which('clang-tidy'):
             error("--clang-tidy requires clang-tidy to be installed")
 
@@ -270,7 +279,7 @@ def find_all_issues(args, check_files=None):
         from .modes import find_issues
         yield from find_issues(check_files, ('openage', 'buildsystem',
                                              'libopenage', 'etc/gdb_pretty'))
-    if args.clangtidy:
+    if args.clang_tidy:
         from .clangtidy import find_issues
         yield from find_issues(check_files, ('libopenage', ))
 

kevinfile

@@ -6,7 +6,7 @@
 
 sanity_check:
 	- skip              (? if job != "debian" ?)
-	make checkall
+	make checkmerge
 
 # Various optimisation options can affect warnings compiler generates.
 # Make sure both release and debug are tested. Arch job has more checks,