mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Adjust so that we use Bullseye to build the docs.

Browse source 
This fixes the vulkan extension table.
This commit is contained in:
Ryan Pavlik 2021-11-04 12:52:29 -05:00
parent 3bd0a07aa2
commit 14ed993d80
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -227,15 +227,14 @@ reuse:
- meson .. $MESON_ARGS - meson .. $MESON_ARGS
- ninja - ninja
debian:cmake: debian:bullseye:cmake:
extends: extends:
- .monado.variables.debian:buster - .monado.variables.debian:bullseye
- .fdo.distribution-image@debian # from ci-templates - .fdo.distribution-image@debian # from ci-templates
- .monado.base-job.build-cmake - .monado.base-job.build-cmake
before_script: before_script:
# Generate "changes since last release" and add to changelog, # Generate "changes since last release" and add to changelog,
# since this is the build that makes our docs. # since this is the build that makes our docs.
- pip3 install proclamation
- pushd doc/changes - pushd doc/changes
- proclamation build --overwrite vNEXT - proclamation build --overwrite vNEXT
- popd - popd
@ -503,7 +502,7 @@ pages:
only: only:
- master - master
dependencies: dependencies:
- debian:cmake - debian:bullseye:cmake
- reprepro:package - reprepro:package
script: script:
- mkdir -p public - mkdir -p public

4
.gitlab-ci/debian_bullseye_container_prep.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Copyright 2018-2020, Collabora, Ltd. and the Monado contributors # Copyright 2018-2021, Collabora, Ltd. and the Monado contributors
# SPDX-License-Identifier: BSL-1.0 # SPDX-License-Identifier: BSL-1.0
( (
@ -10,3 +10,5 @@
cd $(dirname $0) cd $(dirname $0)
bash ./build-openxr-openhmd.sh bash ./build-openxr-openhmd.sh
) )
python3 -m pip install proclamation