Merge branch 'separate-ci-checks'

* separate-ci-checks:
  GITHUB: workflows/testing.yml: avoid make all vs make check races
  Makefile.mk: ensure all checks are added $(CHECK_TARGETS)

Signed-off-by: Tim Janik <[email protected]>

.github/workflows/testing.yml

@@ -44,7 +44,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CITAG: arch
-      CIMAKE: misc/cirun -u 1000 make
       CICACHE: /tmp/cicache
     steps:
     - uses: actions/checkout@v4
@@ -59,9 +58,9 @@ jobs:
         misc/cirun -u 1000 misc/version.sh
     - name: 'Run X11 GUI Tests'
       run: |
-        $CIMAKE GCC_COLORS="" -j`nproc` all
-        $CIMAKE -j`nproc` check
-        $CIMAKE x11test-v
+        misc/cirun -u 1000 make GCC_COLORS="" -j`nproc` all
+        misc/cirun -u 1000 make -j`nproc` check
+        misc/cirun -u 1000 make x11test-v
     # Artifact upload from x11test
     - uses: actions/[email protected]
       if: always()
@@ -74,7 +73,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CITAG: focal
-      CIMAKE: misc/cirun -u 1000 make
       CICACHE: /tmp/cicache
     steps:
     - uses: actions/checkout@v4
@@ -88,10 +86,11 @@ jobs:
         misc/cirun -u 1000 misc/version.sh
     - name: 'Make all check'
       run: |
-        $CIMAKE -j`nproc` all check
+        misc/cirun -u 1000 make -j`nproc` all
+        misc/cirun -u 1000 make -j`nproc` check
     - name: 'Make clang-tidy'
       run: |
-        $CIMAKE -j`nproc` clang-tidy
+        misc/cirun -u 1000 make -j`nproc` clang-tidy
     # Artifact upload from clang-tidy
     - uses: actions/[email protected]
       with: { name: clang-tidy, path: out/clang-tidy/ }

Makefile.mk

@@ -295,7 +295,8 @@ $$(dir $1)check-$$(notdir $1): $1
 	$$Q $1
 endef
 $(foreach TEST, $(ALL_TESTS), $(eval $(call CHECK_ALL_TESTS_TEST, $(TEST))))
-check: $(CHECK_TARGETS) check-audio check-bench lint
+CHECK_TARGETS += check-audio check-bench
+check: $(CHECK_TARGETS) lint
 $(CHECK_TARGETS): FORCE
 check-bench: FORCE