From bc59acee8ed671923c627238bcdf79fb6da6ca50 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:20:17 +0100 Subject: [PATCH] ci/container: move wayland build section into the script itself Part-of: --- .gitlab-ci/container/build-wayland.sh | 4 ++++ .gitlab-ci/container/debian/test-base.sh | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh index 97e1f939c79..d6117254e87 100644 --- a/.gitlab-ci/container/build-wayland.sh +++ b/.gitlab-ci/container/build-wayland.sh @@ -3,6 +3,8 @@ set -uex +uncollapsed_section_start wayland "Building Wayland" + # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: # DEBIAN_BUILD_TAG @@ -30,3 +32,5 @@ meson setup -Dtests=false _build ${EXTRA_MESON_ARGS:-} meson install -C _build cd .. rm -rf wayland-protocols + +section_end wayland diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index c3989d565c9..3615829dbeb 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -149,8 +149,6 @@ fi ############### Build Wayland -uncollapsed_section_switch wayland "Building Wayland" - . .gitlab-ci/container/build-wayland.sh ############### Install Rust toolchain