diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 243ea7dcc80c93e86c093576d8e63425aa9fb112..6c84aa04c5bf3d90f3fc71cf628245e774aba7fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,13 +37,14 @@ 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 + XVFB_RUN: xvfb-run -a -s -noreset -.trixie_vars: &trixie_vars +.forky_vars: &forky_vars variables: - DIST: trixie + DIST: forky BUILD_OPTS: ${COMMON_BUILD_OPTS} .build_step: &build_step @@ -80,23 +81,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 +105,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] @@ -112,7 +113,7 @@ asan-test-native-debian-trixie: <<: *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: diff --git a/tests/meson.build b/tests/meson.build index c2a042ddd2c1c058c34a608363578ea5b2d53790..feb647aa2af2a44854e475c4bcc9975961865466 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')