Merge pull request #29765 from jayaddison/issue-29749/add-ubuntu2404-runner

tacaswell · web-flow · commit 7d5d0278fb52 · 2025-03-31T23:04:33.000-04:00
ci: Introduce ubuntu-24.04 to restore GTK test coverage with recent PyGObject versions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -83,6 +83,12 @@ jobs:
             pyqt6-ver: '!=6.6.0'
             # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
             pyside6-ver: '!=6.5.1'
+          - os: ubuntu-24.04
+            python-version: '3.12'
+            # https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
+            pyqt6-ver: '!=6.6.0'
+            # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
+            pyside6-ver: '!=6.5.1'
           - os: macos-13  # This runner is on Intel chips.
             # merge numpy and pandas install in nighties test when this runner is dropped
             python-version: '3.10'
@@ -136,7 +142,6 @@ jobs:
               libcairo2-dev \
               libffi-dev \
               libgeos-dev \
-              libgirepository1.0-dev \
               libnotify4 \
               libsdl2-2.0-0 \
               libxkbcommon-x11-0 \
@@ -161,7 +166,14 @@ jobs:
             if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
               sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
             fi
-            sudo apt-get install -yy --no-install-recommends gir1.2-gtk-4.0
+            if [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
+              sudo apt-get install -yy --no-install-recommends \
+                gir1.2-gtk-4.0 \
+                libgirepository1.0-dev
+            else  # ubuntu-24.04
+              sudo apt-get install -yy --no-install-recommends \
+                libgirepository-2.0-dev
+            fi
             ;;
           macOS)
             brew update
@@ -384,11 +396,17 @@ jobs:
         if: ${{ !cancelled() && github.event_name != 'schedule' }}
         run: |
           if [[ "${{ runner.os }}" != 'macOS' ]]; then
-            lcov --rc lcov_branch_coverage=1 --capture --directory . \
-              --output-file coverage.info
-            lcov --rc lcov_branch_coverage=1 --output-file coverage.info \
-              --extract coverage.info $PWD/src/'*' $PWD/lib/'*'
-            lcov --rc lcov_branch_coverage=1 --list coverage.info
+            LCOV_IGNORE_ERRORS=','  # do not ignore any lcov errors by default
+            if [[ "${{ matrix.os }}" = ubuntu-24.04 ]]; then
+              # filter mismatch and unused-entity errors detected by lcov 2.x
+              LCOV_IGNORE_ERRORS='mismatch,unused'
+            fi
+            lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
+              --capture --directory . --output-file coverage.info
+            lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
+              --output-file coverage.info --extract coverage.info $PWD/src/'*' $PWD/lib/'*'
+            lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
+              --list coverage.info
             find . -name '*.gc*' -delete
           else
             xcrun llvm-profdata merge -sparse default.*.profraw \
