From 9265cec126ba7494f7fa6b3322091e80b78b9d91 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 8 Jan 2025 13:59:55 +0000 Subject: [PATCH 1/6] ci: Move more workflows to ubuntu 24.04 So they can be picked up by the self-hosted runner as well --- .github/workflows/examples.yml | 2 +- .github/workflows/layouting.yml | 2 +- .github/workflows/python_and_static.yml | 10 +++++----- .github/workflows/valgrind-leakcheck.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index b04a7432b..64f4769a3 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -23,7 +23,7 @@ jobs: fail-fast: true matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - windows-2022 - macos-13 preset: diff --git a/.github/workflows/layouting.yml b/.github/workflows/layouting.yml index 9d70e8164..88e91225e 100644 --- a/.github/workflows/layouting.yml +++ b/.github/workflows/layouting.yml @@ -23,7 +23,7 @@ jobs: fail-fast: true matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - windows-2022 - macos-13 steps: diff --git a/.github/workflows/python_and_static.yml b/.github/workflows/python_and_static.yml index 17058ffc9..fcb97ffdf 100644 --- a/.github/workflows/python_and_static.yml +++ b/.github/workflows/python_and_static.yml @@ -22,7 +22,7 @@ jobs: fail-fast: true matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - windows-2022 - windows-2019 - macos-13 @@ -40,23 +40,23 @@ jobs: qt_version: "6.3.*" include: - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: name: ci-clang-tidy-qt6 qt_version: "6.3.*" - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: name: clazy build_preset_arg: '--preset=clazy' qt_version: "5.15" - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: name: ci-dev-valgrind-qt5 qt_version: "5.15" - - os: ubuntu-22.04 + - os: ubuntu-24.04 preset: name: ci-dev-valgrind-qt6 qt_version: "6.5.*" diff --git a/.github/workflows/valgrind-leakcheck.yml b/.github/workflows/valgrind-leakcheck.yml index 9c5eb6f57..25e74c7a7 100644 --- a/.github/workflows/valgrind-leakcheck.yml +++ b/.github/workflows/valgrind-leakcheck.yml @@ -23,7 +23,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: true steps: From cc873621b8c4e057467d97365ea08c2d42c22955 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 8 Jan 2025 14:01:46 +0000 Subject: [PATCH 2/6] ci: Add ubuntu-24.04 label to the self-hosted runner --- .github/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile index eec85b1c3..5ac10800d 100644 --- a/.github/docker/Dockerfile +++ b/.github/docker/Dockerfile @@ -79,4 +79,4 @@ WORKDIR /home/ubuntu RUN mkdir actions-runner && cd actions-runner && \ curl -o actions-runner-linux-x64-2.321.0.tar.gz -L https://github.com/actions/runner/releases/download/v2.321.0/actions-runner-linux-x64-2.321.0.tar.gz && \ echo "ba46ba7ce3a4d7236b16fbe44419fb453bc08f866b24f04d549ec89f1722a29e actions-runner-linux-x64-2.321.0.tar.gz" | shasum -a 256 -c && \ - tar xzf ./actions-runner-linux-x64-2.321.0.tar.gz && ./config.sh --labels ubuntu-latest --url https://github.com/KDAB/KDDockWidgets --token $GITHUB_RUNNER_TOKEN + tar xzf ./actions-runner-linux-x64-2.321.0.tar.gz && ./config.sh --labels ubuntu-latest,ubuntu-24.04 --url https://github.com/KDAB/KDDockWidgets --token $GITHUB_RUNNER_TOKEN From 7e456b2648ecbb80bb3ebf3bfd1c5656386e2baa Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 8 Jan 2025 14:23:37 +0000 Subject: [PATCH 3/6] ci: Add a suppression for leaks in ubuntu-24.04 --- valgrind.sup | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/valgrind.sup b/valgrind.sup index 695202fb9..db0ff9e25 100644 --- a/valgrind.sup +++ b/valgrind.sup @@ -197,3 +197,21 @@ ... fun:_ZN18QThreadPoolPrivate11startThreadEP9QRunnable } + +{ + + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + obj:/usr/lib/x86_64-linux-gnu/libfontconfig.so.1.12.1 + obj:/usr/lib/x86_64-linux-gnu/libfontconfig.so.1.12.1 + fun:FcInitBringUptoDate + fun:FcFontList + fun:_ZN19QFontconfigDatabase20populateFontDatabaseEv + fun:_ZN20QFontDatabasePrivate18ensureFontDatabaseEv + fun:_ZN20QFontDatabasePrivate8findFontERK8QFontDefib + fun:_ZN20QFontDatabasePrivate4loadEPK12QFontPrivatei + fun:_ZNK12QFontPrivate15engineForScriptEi + fun:_ZNK13QFontMetricsF7leadingEv + obj:/opt/qt/6.6.0/gcc_64/lib/libQt6Gui.so.6.6.0 +} From 1bfe38ab69291b63dbf0c054e3be9a558fa46c11 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 8 Jan 2025 14:25:00 +0000 Subject: [PATCH 4/6] ci: Add clang-tidy to self-hosted runner --- .github/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile index 5ac10800d..c5dfd7868 100644 --- a/.github/docker/Dockerfile +++ b/.github/docker/Dockerfile @@ -30,7 +30,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt update -qq && apt install build-essential software-properties-common lld git cmake ninja-build vim curl wget gdebi-core libdbus-glib-1-2 \ mesa-common-dev libglu1-mesa-dev libglib2.0-dev libfontconfig \ libxkbcommon-dev mesa-utils libgl1-mesa-dev libglu1-mesa-dev \ - libxkbcommon-x11-0 libssl-dev openssl unzip clang libgtk-3-dev \ + libxkbcommon-x11-0 libssl-dev openssl unzip clang clang-tidy libgtk-3-dev \ time xvfb python3-pip jq sudo libxml2-dev libxslt-dev \ libx11-xcb1 \ libxcb-glx0 \ From 40d3ba238df11fe319dc34525b87693031dd5ae0 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 8 Jan 2025 16:46:40 +0000 Subject: [PATCH 5/6] ci: try to make the suppression work --- valgrind.sup | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/valgrind.sup b/valgrind.sup index db0ff9e25..d8e1abf28 100644 --- a/valgrind.sup +++ b/valgrind.sup @@ -215,3 +215,12 @@ fun:_ZNK13QFontMetricsF7leadingEv obj:/opt/qt/6.6.0/gcc_64/lib/libQt6Gui.so.6.6.0 } + +{ + + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + obj:/usr/lib/x86_64-linux-gnu/libfontconfig.so.1.12.1 + ... +} From 832cbf746957ff9a1865c70864c1174d42f6a84e Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 8 Jan 2025 18:30:05 +0000 Subject: [PATCH 6/6] ci: try to fix clang-tidy build on self-hosted runner --- .clang-tidy | 1 + 1 file changed, 1 insertion(+) diff --git a/.clang-tidy b/.clang-tidy index 4c42e1edb..96dac5ac9 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -65,4 +65,5 @@ Checks: '*, -google-*, -objc-*, -llvmlibc-*, -zircon-*, -portability-template-virtual-member-function, -performance-enum-size, -bugprone-narrowing-conversions, +-clang-diagnostic-deprecated-declarations, '