summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-03-03 09:55:14 +0100
committerJörg Frings-Fürst <debian@jff.email>2024-03-03 09:55:14 +0100
commitb098beb219b0b300ec7eb915bfa2b3038c3fb533 (patch)
tree08c40dc8b180b31f504945e8da3e3ea3950e4145 /.gitlab-ci.yml
parent2938695ca4c9bca7834817465662e31570f6d32f (diff)
parent23c348d62ab9f0a902189c70921310a5f856852c (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6334acb..f68aa36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,8 +38,8 @@ make-dist:
- mkdir build
- cd build
- tar xzf ../sane-backends-*.tar.gz --strip-components=1
- - ./configure $CONFIGURE_OPTS
- - make -j2 -k $MAKE_FLAGS
+ - (set -x; ./configure $CONFIGURE_OPTS)
+ - eval "(set -x; make -j2 -k $MAKE_FLAGS)"
debian-10-full:
image: $REGISTRY_HUB:debian-buster-full
@@ -87,9 +87,8 @@ alpine-3.15-musl:
image: $REGISTRY_HUB:alpine-3.15-musl
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
- MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
+ MAKE_FLAGS: "CFLAGS='-Werror -Wno-pedantic' CXXFLAGS=-Werror"
<<: *compile_definition
- allow_failure: true
ubuntu-22.04-lts:
image: $REGISTRY_HUB:ubuntu-jammy-dist