From 918b834a3bb77ca9a9d89e9d6732e99b1b2d48e5 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 9 Apr 2019 11:07:14 -0500 Subject: [PATCH] ci: Add arch linux build --- .gitlab-ci.yml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bf55995d..bec870a46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,47 @@ variables: UPSTREAM_REPO: monado/monado + DEBIAN_VERSION: buster DEBIAN_TAG: '2019-03-19.0' DEBIAN_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG DEBIAN_DEBS: build-essential git cmake meson ninja-build doxygen graphviz libeigen3-dev curl patch python3 pkg-config libx11-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libhidapi-dev libwayland-dev libvulkan-dev glslang-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates DEBIAN_EXEC: 'bash .gitlab-ci/build-openxr-openhmd.sh' + + ARCH_TAG: '2019-04-09.0' + ARCH_PKGS: 'git gcc cmake meson ninja pkgconfig python3 diffutils patch doxygen graphviz eigen hidapi libxrandr mesa glslang vulkan-headers vulkan-icd-loader check glfw-x11' + ARCH_EXEC: 'bash .gitlab-ci/build-openxr-openhmd.sh' + ARCH_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/archlinux/rolling:$ARCH_TAG include: - project: 'wayland/ci-templates' ref: c73dae8b84697ef18e2dbbf4fed7386d9652b0cd file: '/templates/debian.yml' + - project: 'wayland/ci-templates' + ref: 96912c7331cbc6da41fbf22c4217aa541176f063 + file: '/templates/arch.yml' stages: - container_prep - build -container_prep: +debian:container_prep: extends: .debian@container-ifnot-exists stage: container_prep -build-cmake: +arch:container_prep: + extends: .arch@container-ifnot-exists + stage: container_prep + +debian:build-cmake: + stage: build + image: $DEBIAN_CONTAINER_IMAGE + script: + - mkdir build + - pushd build + - cmake -GNinja .. + - ninja + +arch:build-cmake: stage: build image: $DEBIAN_CONTAINER_IMAGE script: