CI: disable Ubuntu noble builds until images are available

This commit is contained in:
Sebastian Ramacher 2023-12-11 22:38:54 +01:00
parent 3a9627e63c
commit e68c0f5f7f
2 changed files with 34 additions and 35 deletions

View file

@ -153,38 +153,37 @@ test:ubuntu-jammy:
- tags - tags
# Ubuntu 24.04 LTS (noble) # Ubuntu 24.04 LTS (noble)
build:ubuntu-noble: # build:ubuntu-noble:
tags: # tags:
- pwmt # - pwmt
stage: build # stage: build
image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:noble # image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:noble
script: # script:
- meson subprojects update # - meson subprojects update
- mkdir -p build && cd build # - mkdir -p build && cd build
- meson --force-fallback-for=girara .. # - meson --force-fallback-for=girara ..
- ninja # - ninja
cache: # cache:
<<: *girara_cache # <<: *girara_cache
artifacts: # artifacts:
expire_in: 6 hours # expire_in: 6 hours
paths: # paths:
- build # - build
except: # except:
- tags # - 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
# 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

View file

@ -39,7 +39,7 @@ if check.found()
xvfb_args = ['-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset'] xvfb_args = ['-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset']
xvfb_h_output = run_command(xvfb, '-h', capture: true, check: false) xvfb_h_output = run_command(xvfb, '-h', capture: true, check: false)
if xvfb_h_output.stdout().contains('--auto-display') if xvfb_h_output.stdout().contains('--auto-display')
# becasue Arch # becasue Arch and Fedora
xvfb_args += ['-d'] xvfb_args += ['-d']
else else
xvfb_args += ['-a'] xvfb_args += ['-a']