From 8649f766a6581f78f1bbcdfb9dd8dde3ea11ba1d Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 1 Jul 2021 19:01:03 +0100 Subject: [PATCH] CI: Skip unpackaged scout builds We exercise scout via the .deb packaging, there's little point in doing a redundant set of builds. Signed-off-by: Simon McVittie <smcv@collabora.com> --- debian/gitlab-ci.yml | 86 -------------------------------------------- 1 file changed, 86 deletions(-) diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml index 24ae53b12..f0092888b 100644 --- a/debian/gitlab-ci.yml +++ b/debian/gitlab-ci.yml @@ -209,92 +209,6 @@ build:clang: mkdir -p _build/scout -build:scout: - stage: build - tags: - - docker - - linux - image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_DOCKER_IMAGE}" - script: - - *prepare_scout - - | - meson \ - --prefix="$(pwd)/_build/scout/prefix" \ - -Dsrcdir=src \ - --werror \ - _build/scout - ninja -C _build/scout - G_MESSAGES_DEBUG=all meson test --verbose -C _build/scout - ninja -C _build/scout install - artifacts: - paths: - - _build/scout/prefix - - _build/scout/meson-logs/*.txt - when: always - -build:scout-i386: - stage: build - tags: - - docker - - linux - image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_I386_DOCKER_IMAGE}" - script: - - *prepare_scout - - | - meson \ - --prefix="$(pwd)/_build/scout/prefix" \ - -Dsrcdir=src \ - -Dbin=false \ - -Dpressure_vessel=false \ - --werror \ - _build/scout-i386 - ninja -C _build/scout-i386 - G_MESSAGES_DEBUG=all meson test --verbose -C _build/scout-i386 - ninja -C _build/scout-i386 install - artifacts: - paths: - - _build/scout/prefix - - _build/scout-i386/meson-logs/*.txt - when: always - -relocatable-install:debug: - stage: relocatable-install - needs: - - build:scout - - build:scout-i386 - tags: - - docker - - linux - image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_DOCKER_IMAGE}" - script: - - *prepare_scout - - | - apt-get -y --no-install-recommends install \ - bubblewrap \ - libglib2.0-dev:amd64 \ - libglib2.0-dev:i386 \ - libxau-dev:amd64 \ - libxau-dev:i386 \ - meson \ - waffle-utils-multiarch:amd64 \ - waffle-utils-multiarch:i386 \ - ${NULL+} - - rm -fr _build/debug/relocatable-install - mkdir -p _build/debug - _build/scout/prefix/lib/pressure-vessel/relocatable/bin/pressure-vessel-build-relocatable-install \ - --output _build/debug/relocatable-install \ - --archive "$(pwd)/_build/debug" \ - ${CI_ALLOW_MISSING_SOURCES:+--allow-missing-sources} \ - ${NULL+} - prove -epython3.5 -v ./tests/pressure-vessel/relocatable-install.py :: \ - "$(pwd)/_build/debug/relocatable-install" - artifacts: - paths: - - _build/debug/pressure-vessel-*-bin.tar.gz - - _build/debug/pressure-vessel-*-bin+src.tar.gz - when: on_success - relocatable-install:production: stage: relocatable-install needs: -- GitLab