diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 114e7db..7975fbb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,38 +153,37 @@ test:ubuntu-jammy: - tags # Ubuntu 24.04 LTS (noble) -build:ubuntu-noble: - tags: - - pwmt - stage: build - image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:noble - script: - - meson subprojects update - - mkdir -p build && cd build - - meson --force-fallback-for=girara .. - - ninja - cache: - <<: *girara_cache - artifacts: - expire_in: 6 hours - paths: - - build - except: - - tags - -test:ubuntu-noble: - tags: - - pwmt - stage: test - image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:noble - script: - - cd build - - ninja test - cache: - <<: *girara_cache - policy: pull - dependencies: - - build:ubuntu-noble - except: - - tags +# build:ubuntu-noble: +# tags: +# - pwmt +# stage: build +# image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:noble +# script: +# - meson subprojects update +# - mkdir -p build && cd build +# - meson --force-fallback-for=girara .. +# - ninja +# cache: +# <<: *girara_cache +# artifacts: +# expire_in: 6 hours +# paths: +# - build +# except: +# - tags +# test:ubuntu-noble: +# tags: +# - pwmt +# stage: test +# image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:noble +# script: +# - cd build +# - ninja test +# cache: +# <<: *girara_cache +# policy: pull +# dependencies: +# - build:ubuntu-noble +# except: +# - tags diff --git a/tests/meson.build b/tests/meson.build index 4b06a89..5e662bb 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -39,7 +39,7 @@ if check.found() xvfb_args = ['-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset'] xvfb_h_output = run_command(xvfb, '-h', capture: true, check: false) if xvfb_h_output.stdout().contains('--auto-display') - # becasue Arch + # becasue Arch and Fedora xvfb_args += ['-d'] else xvfb_args += ['-a']