From 14ed993d8062269e76973a8772fd48eb509af089 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 4 Nov 2021 12:52:29 -0500 Subject: [PATCH] ci: Adjust so that we use Bullseye to build the docs. This fixes the vulkan extension table. --- .gitlab-ci.yml | 7 +++---- .gitlab-ci/debian_bullseye_container_prep.sh | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa73b88c6..c0189877e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -227,15 +227,14 @@ reuse: - meson .. $MESON_ARGS - ninja -debian:cmake: +debian:bullseye:cmake: extends: - - .monado.variables.debian:buster + - .monado.variables.debian:bullseye - .fdo.distribution-image@debian # from ci-templates - .monado.base-job.build-cmake before_script: # Generate "changes since last release" and add to changelog, # since this is the build that makes our docs. - - pip3 install proclamation - pushd doc/changes - proclamation build --overwrite vNEXT - popd @@ -503,7 +502,7 @@ pages: only: - master dependencies: - - debian:cmake + - debian:bullseye:cmake - reprepro:package script: - mkdir -p public diff --git a/.gitlab-ci/debian_bullseye_container_prep.sh b/.gitlab-ci/debian_bullseye_container_prep.sh index 54059dfca..18cdb5c40 100644 --- a/.gitlab-ci/debian_bullseye_container_prep.sh +++ b/.gitlab-ci/debian_bullseye_container_prep.sh @@ -1,5 +1,5 @@ #!/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 ( @@ -10,3 +10,5 @@ cd $(dirname $0) bash ./build-openxr-openhmd.sh ) + +python3 -m pip install proclamation