From fade8b1ef21f9e1c7f905215ac7209c6160a2b7a Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Tue, 14 Dec 2021 14:24:24 -0600 Subject: ci: use meson on debian, not legacy build system --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8cab932..45498a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: variables: PACKAGE_ENDPOINT: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/" -test:alpine: +test-legacy:alpine: image: alpine stage: test script: @@ -18,7 +18,7 @@ test:alpine: - docker-alpine - x86_64 -test-meson:alpine: +test:alpine: image: alpine stage: test script: @@ -35,10 +35,11 @@ test:debian: stage: test script: - apt-get update - - apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.3-dev lua5.2 lua-zlib-dev sudo + - apt-get install -y make gcc git libssl-dev zlib1g-dev lua5.3-dev lua5.2 lua-zlib-dev sudo meson - unlink /bin/sh - ln -s /bin/bash /bin/sh - - make -j$(nproc) check + - meson build + - ninja -C build tags: - docker-alpine - x86_64 -- cgit v1.2.3-70-g09d2