Fixed merge conflict with #3483

Author: oddbookworm

.github/workflows/cppcheck.yml

@@ -1,17 +1,13 @@
-# This workflow runs a build with a python version that has debug symbols
-# Also generates coverage information from unit tests
-#
-# Note that for intrinsics, it only runs what gets compiled
-# -# and would naturally run. It also is limited to what can run in
-# -# a CI environment
-# -# IMPORTANT: binaries are not to be uploaded from this workflow!
-#
+# This workflow runs a build with a python version that has debug symbols.
+# Also generates coverage information from unit tests. Note that for intrinsics,
+# it only runs what gets compiled and would naturally run. It also is limited to
+# what can run in a CI environment.
 # Update this workflow when our min/max python minor versions update
 # This workflow is necessary to ensure that we can build and run with
 # a debug python build without too much worrying about SIGABRT being thrown
 # IMPORTANT: binaries are not to be uploaded from this workflow!
 
-name: Ubuntu debug
+name: Ubuntu Checks
 defaults:
   run:
     shell: bash -leo pipefail {0}
@@ -30,7 +26,7 @@ on:
       - '*.md'
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-debug.yml'
+      - '!.github/workflows/run-ubuntu-checks.yml'
 
   pull_request:
     branches: main
@@ -42,14 +38,14 @@ on:
       - '*.md'
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-debug.yml'
+      - '!.github/workflows/run-ubuntu-checks.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-ubuntu-debug
+  group: ${{ github.workflow }}-${{ github.ref }}-ubuntu-checks
   cancel-in-progress: true
 
 jobs:
-  debug:
+  debug_coverage:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
@@ -106,7 +102,7 @@ jobs:
       id: build-pygame-ce
       run: |
         pyenv global ${{ matrix.python }}-debug
-        python dev.py build --wheel --lax --coverage --ctest
+        python dev.py build --lax --coverage
 
     - name: Run tests
       env:
@@ -119,7 +115,7 @@ jobs:
     - name: Generate coverage
       id: gen-coverage
       # want to continue regardless of whether a test failed or not as long as the job wasn't cancelled
-      if: ${{ steps.build.conclusion == 'success' && !cancelled() }}
+      if: ${{ steps.build-pygame-ce.conclusion == 'success' && !cancelled() }}
       run: |
         lcov --capture --directory . --output-file ./coverage.info
         genhtml ./coverage.info --output-directory ./out
@@ -139,3 +135,32 @@ jobs:
       with:
         name: ctest_suite_log
         path: ./ctest.log
+
+  # Run cppcheck static analysis on src_c changes
+  run-cppcheck:
+    runs-on: ubuntu-24.04
+    needs: debug_coverage
+
+    steps:
+    - uses: actions/checkout@v4.2.2
+
+    - name: Check if any src_c files changed
+      id: check-changes
+      run: |
+        git fetch origin ${{ github.base_ref }} --depth=1 || true
+        CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
+        echo "$CHANGED_FILES" | grep '^src_c/' || echo "::set-output name=skip::true"
+
+    - name: Install cppcheck
+      if: steps.check-changes.outputs.skip != 'true'
+      run: |
+        sudo apt-get update --fix-missing
+        sudo apt install cppcheck
+
+    - name: Run Static Checker
+      if: steps.check-changes.outputs.skip != 'true'
+      run: cppcheck src_c --enable=performance,portability,warning \
+        --suppress=*:src_c/freetype/ft_cache.c --suppress=*:src_c/scrap* \
+        --suppress=*:src_c/scale_mmx*.c --suppress=*:src_c/SDL_gfx/* \
+        --suppress=missingReturn --suppress=syntaxError -DWITH_THREAD -j $(nproc) \
+        -DPG_MAJOR_VERSION -DPG_MINOR_VERSION -DPG_PATCH_VERSION -DPG_VERSION_TAG