From 90665fb189622cde8db5fa5d52b10856c25c4796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 5 Nov 2025 13:44:56 +0100 Subject: [PATCH 1/4] ci: Update images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure we test against recent GTK. Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 243ea7dc..93441107 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ workflow: variables: # For ci-fairy FDO_UPSTREAM_REPO: World/Phosh/phosh-mobile-settings - DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/phosh-mobile-settings/debian:v0.0.2025-10-20 + DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/phosh-mobile-settings/debian:v0.0.2025-11-05 COMMON_BUILD_OPTS: --werror -Db_coverage=true GCHECK_DIRS: src tests plugins -- GitLab From 466f530feb293a0aab6d7660d6e5bbf458ff65e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 5 Nov 2025 16:19:21 +0100 Subject: [PATCH 2/4] ci: Switch all jobs to forky MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93441107..44c8c973 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,9 +41,9 @@ variables: COMMON_BUILD_OPTS: --werror -Db_coverage=true GCHECK_DIRS: src tests plugins -.trixie_vars: &trixie_vars +.forky_vars: &forky_vars variables: - DIST: trixie + DIST: forky BUILD_OPTS: ${COMMON_BUILD_OPTS} .build_step: &build_step @@ -80,23 +80,23 @@ sanity: rules: - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME' -build:native-debian-trixie: +build:native-debian-forky: stage: build image: ${DEBIAN_IMAGE} <<: *before - <<: *trixie_vars + <<: *forky_vars <<: *build_step artifacts: paths: - _build -test:native-debian-trixie: +test:native-debian-forky: stage: test image: ${DEBIAN_IMAGE} needs: - - build:native-debian-trixie + - build:native-debian-forky <<: *before - <<: *trixie_vars + <<: *forky_vars <<: *test_step coverage: '/^lines:\s+([\d.]+\%)\s+/' artifacts: @@ -104,7 +104,7 @@ test:native-debian-trixie: reports: junit: _build/meson-logs/testlog.junit.xml -asan-test-native-debian-trixie: +asan-test-native-debian-forky: stage: test image: ${DEBIAN_IMAGE} tags: [asan] -- GitLab From e85ee7e1f4e9f397793f75999db7dbc848423502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 5 Nov 2025 16:29:36 +0100 Subject: [PATCH 3/4] ci: Robustify xvfb-run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44c8c973..6c84aa04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,7 @@ variables: DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/phosh-mobile-settings/debian:v0.0.2025-11-05 COMMON_BUILD_OPTS: --werror -Db_coverage=true GCHECK_DIRS: src tests plugins + XVFB_RUN: xvfb-run -a -s -noreset .forky_vars: &forky_vars variables: @@ -112,7 +113,7 @@ asan-test-native-debian-forky: <<: *before script: - meson setup -Db_sanitize=address _build-asan - - xvfb-run meson test --print-errorlogs -C _build-asan + - ${XVFB_RUN} meson test --print-errorlogs -C _build-asan allow_failure: true check-po: -- GitLab From 2b048ee529246ac03cc06777b7b4fb1addda4d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 5 Nov 2025 16:33:11 +0100 Subject: [PATCH 4/4] ci: Don't set renderer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This lets test fail when running under xvfb and everyone should have recent enough GTK nowadays. Signed-off-by: Guido Günther Part-of: --- tests/meson.build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/meson.build b/tests/meson.build index c2a042dd..feb647aa 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -14,11 +14,6 @@ test_env_common.set( 'suppressions=@0@/data/leak-suppress.txt'.format(meson.project_source_root()), ) -if gtk_dep.version().version_compare('>=4.19.1') - test_env_common.set('GSK_RENDERER', 'opengl') -else - test_env_common.set('GSK_RENDERER', 'ngl') -endif test_env_common.set('MS_FORCE_OSK', 'unknown') subdir('utils') -- GitLab