Skip to content

Commit ad69c7e

Browse files
committed
ci: Add ubuntu-24.04 runner to test workflows
1 parent 0d11978 commit ad69c7e

File tree

1 file changed

+25
-7
lines changed

1 file changed

+25
-7
lines changed

.github/workflows/tests.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ jobs:
8383
pyqt6-ver: '!=6.6.0'
8484
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
8585
pyside6-ver: '!=6.5.1'
86+
- os: ubuntu-24.04
87+
python-version: '3.12'
88+
# https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045606.html
89+
pyqt6-ver: '!=6.6.0'
90+
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
91+
pyside6-ver: '!=6.5.1'
8692
- os: macos-13 # This runner is on Intel chips.
8793
# merge numpy and pandas install in nighties test when this runner is dropped
8894
python-version: '3.10'
@@ -136,7 +142,6 @@ jobs:
136142
libcairo2-dev \
137143
libffi-dev \
138144
libgeos-dev \
139-
libgirepository1.0-dev \
140145
libnotify4 \
141146
libsdl2-2.0-0 \
142147
libxkbcommon-x11-0 \
@@ -161,7 +166,14 @@ jobs:
161166
if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
162167
sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
163168
fi
164-
sudo apt-get install -yy --no-install-recommends gir1.2-gtk-4.0
169+
if [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
170+
sudo apt-get install -yy --no-install-recommends \
171+
gir1.2-gtk-4.0 \
172+
libgirepository1.0-dev
173+
else # ubuntu-24.04
174+
sudo apt-get install -yy --no-install-recommends \
175+
libgirepository-2.0-dev
176+
fi
165177
;;
166178
macOS)
167179
brew update
@@ -384,11 +396,17 @@ jobs:
384396
if: ${{ !cancelled() && github.event_name != 'schedule' }}
385397
run: |
386398
if [[ "${{ runner.os }}" != 'macOS' ]]; then
387-
lcov --rc lcov_branch_coverage=1 --capture --directory . \
388-
--output-file coverage.info
389-
lcov --rc lcov_branch_coverage=1 --output-file coverage.info \
390-
--extract coverage.info $PWD/src/'*' $PWD/lib/'*'
391-
lcov --rc lcov_branch_coverage=1 --list coverage.info
399+
LCOV_IGNORE_ERRORS=',' # do not ignore any lcov errors by default
400+
if [[ "${{ matrix.os }}" = ubuntu-24.04 ]]; then
401+
# filter mismatch and unused-entity errors detected by lcov 2.x
402+
LCOV_IGNORE_ERRORS='mismatch,unused'
403+
fi
404+
lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
405+
--capture --directory . --output-file coverage.info
406+
lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
407+
--output-file coverage.info --extract coverage.info $PWD/src/'*' $PWD/lib/'*'
408+
lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
409+
--list coverage.info
392410
find . -name '*.gc*' -delete
393411
else
394412
xcrun llvm-profdata merge -sparse default.*.profraw \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy