From 75db5527fc5e0a94cd1e95fe184f0c0578fe977b Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 19 Aug 2019 16:22:57 +0100 Subject: [PATCH] Move Gitlab-CI setup into debian directory Signed-off-by: Simon McVittie <smcv@collabora.com> --- .gitlab-ci.yml | 93 -------------------------------------------- debian/gitlab-ci.yml | 79 +++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 93 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 3c667e62d..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,93 +0,0 @@ -include: - - project: 'steam/steam-ci-pipeline' - file: '/steam-gitlab-ci-common.yml' - - - project: 'steam/steam-ci-pipeline' - file: '/steam-gitlab-ci-pipeline.yml' - -variables: - BUILD_IMAGE: docker.internal.steamos.cloud/steamrt/sdk:scout-latest - STEAM_CI_USE_BINARIES_FROM: autopkgtest - STEAM_CI_DEPENDENCIES: >- - debhelper - libglib2.0-dev - libxau-dev - meson - python3 - python3.5 - zlib1g - - DEBIAN_FRONTEND: noninteractive - - SCOUT_DOCKER_REGISTRY: docker.steamos.cloud - SCOUT_DOCKER_IMAGE: steamrt/sdk:scout - SCOUT_APT_SOURCES_FILE: '' - DEVEL_DOCKER_REGISTRY: docker.steamos.cloud - DEVEL_DOCKER_IMAGE: steamos/package-builder:buster - -build: - variables: - BUILD_IMAGE: docker.internal.steamos.cloud/steamos/package-builder:buster - -build:devel: - stage: build - image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}" - script: - - | - set -eux - - apt-get -y --no-install-recommends install \ - libglib2.0-dev \ - libxau-dev \ - meson \ - ${NULL+} - - meson _build - ninja -C _build - ninja -C _build install - meson test --verbose -C _build - -build:scout: - stage: build - image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_DOCKER_IMAGE}" - script: - - | - set -eux - - if [ -n "${SCOUT_APT_SOURCES_FILE}" ]; then - cp "${SCOUT_APT_SOURCES_FILE}" /etc/apt/sources.list - apt-get -y update - fi - - apt-get -y --no-install-recommends install \ - bubblewrap \ - libcapsule0 \ - libcapsule-tools-relocatable:amd64 \ - libcapsule-tools-relocatable:i386 \ - libglib2.0-dev \ - libxau-dev \ - meson \ - ${NULL+} - - meson \ - --prefix="$(pwd)/_build/prefix" \ - -Dpython=python3.5 \ - -Dsrcdir=src \ - _build - ninja -C _build - meson test --verbose -C _build - ninja -C _build install - rm -fr _build/relocatable-install - _build/prefix/bin/pressure-vessel-build-relocatable-install \ - --output _build/relocatable-install \ - --archive "$(pwd)/_build" \ - ${NULL+} - prove -v ./tests/relocatable-install.py :: \ - "$(pwd)/_build/relocatable-install" - -# Artifacts are currently disabled because uploading them to the -# coordinator results in HTTP 413 Request Entity Too Large. -# artifacts: -# paths: -# - _build/pressure-vessel-*-bin.tar.gz -# - _build/pressure-vessel-*-bin+src.tar.gz diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml index 2f17ceca9..3c667e62d 100644 --- a/debian/gitlab-ci.yml +++ b/debian/gitlab-ci.yml @@ -8,7 +8,86 @@ include: variables: BUILD_IMAGE: docker.internal.steamos.cloud/steamrt/sdk:scout-latest STEAM_CI_USE_BINARIES_FROM: autopkgtest + STEAM_CI_DEPENDENCIES: >- + debhelper + libglib2.0-dev + libxau-dev + meson + python3 + python3.5 + zlib1g + + DEBIAN_FRONTEND: noninteractive + + SCOUT_DOCKER_REGISTRY: docker.steamos.cloud + SCOUT_DOCKER_IMAGE: steamrt/sdk:scout + SCOUT_APT_SOURCES_FILE: '' + DEVEL_DOCKER_REGISTRY: docker.steamos.cloud + DEVEL_DOCKER_IMAGE: steamos/package-builder:buster build: variables: BUILD_IMAGE: docker.internal.steamos.cloud/steamos/package-builder:buster + +build:devel: + stage: build + image: "${DEVEL_DOCKER_REGISTRY}/${DEVEL_DOCKER_IMAGE}" + script: + - | + set -eux + + apt-get -y --no-install-recommends install \ + libglib2.0-dev \ + libxau-dev \ + meson \ + ${NULL+} + + meson _build + ninja -C _build + ninja -C _build install + meson test --verbose -C _build + +build:scout: + stage: build + image: "${SCOUT_DOCKER_REGISTRY}/${SCOUT_DOCKER_IMAGE}" + script: + - | + set -eux + + if [ -n "${SCOUT_APT_SOURCES_FILE}" ]; then + cp "${SCOUT_APT_SOURCES_FILE}" /etc/apt/sources.list + apt-get -y update + fi + + apt-get -y --no-install-recommends install \ + bubblewrap \ + libcapsule0 \ + libcapsule-tools-relocatable:amd64 \ + libcapsule-tools-relocatable:i386 \ + libglib2.0-dev \ + libxau-dev \ + meson \ + ${NULL+} + + meson \ + --prefix="$(pwd)/_build/prefix" \ + -Dpython=python3.5 \ + -Dsrcdir=src \ + _build + ninja -C _build + meson test --verbose -C _build + ninja -C _build install + rm -fr _build/relocatable-install + _build/prefix/bin/pressure-vessel-build-relocatable-install \ + --output _build/relocatable-install \ + --archive "$(pwd)/_build" \ + ${NULL+} + prove -v ./tests/relocatable-install.py :: \ + "$(pwd)/_build/relocatable-install" + +# Artifacts are currently disabled because uploading them to the +# coordinator results in HTTP 413 Request Entity Too Large. +# artifacts: +# paths: +# - _build/pressure-vessel-*-bin.tar.gz +# - _build/pressure-vessel-*-bin+src.tar.gz -- GitLab