summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-12-14 14:24:24 -0600
committerTimo Teräs <timo.teras@iki.fi>2021-12-29 20:14:41 +0200
commitfade8b1ef21f9e1c7f905215ac7209c6160a2b7a (patch)
treef444ab19863fcdfaa0c0d8375d55250cb217bbbc
parent2c3cef8787198455f70fb530157ba413b77a2b1e (diff)
downloadapk-tools-fade8b1ef21f9e1c7f905215ac7209c6160a2b7a.tar.gz
apk-tools-fade8b1ef21f9e1c7f905215ac7209c6160a2b7a.tar.bz2
apk-tools-fade8b1ef21f9e1c7f905215ac7209c6160a2b7a.tar.xz
apk-tools-fade8b1ef21f9e1c7f905215ac7209c6160a2b7a.zip
ci: use meson on debian, not legacy build system
-rw-r--r--.gitlab-ci.yml9
1 files changed, 5 insertions, 4 deletions
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