summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-09-10 19:11:27 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-09-10 19:11:27 +0200
commit7e9455b3b15671ff99ed168638c405e2acedb6df (patch)
tree444e59ece236e09dc153f665e42160aeb0208c24 /.gitlab-ci.yml
parentbc8a517abd2e11e1435f4ef042cfcc8648b62ef7 (diff)
parentbce41b3c37c2a68e7dab234ce0247755a61ceb40 (diff)
Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml19
1 files changed, 13 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c8758e..4bef8b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
# .gitlab-ci.yml -- to test some source code build scenarios
-# Copyright (C) 2016-2019 Olaf Meeuwissen
+# Copyright (C) 2016-2020 Olaf Meeuwissen
#
# License: GPL-3.0+
variables:
REGISTRY_HUB: "registry.gitlab.com/sane-project/ci-envs"
CONFIGURE_MINI: "--enable-silent-rules"
- CONFIGURE_FULL: "--with-usb --enable-avahi --enable-pnm-backend --with-libcurl"
+ CONFIGURE_FULL: "--with-usb --with-usb-record-replay --with-avahi --enable-pnm-backend --with-libcurl --with-poppler-glib"
stages:
- tarball
@@ -76,18 +76,25 @@ debian-10-full:
- doc/sanei-html
expire_in: 1 day
-fedora-31-clang:
- image: $REGISTRY_HUB:fedora-31-clang
+fedora-32-clang:
+ image: $REGISTRY_HUB:fedora-32-clang
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
<<: *compile_definition
-alpine-3.11-musl:
- image: $REGISTRY_HUB:alpine-3.11-musl
+alpine-3.12-musl:
+ image: $REGISTRY_HUB:alpine-3.12-musl
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
<<: *compile_definition
+ubuntu-16.04-lts:
+ image: $REGISTRY_HUB:ubuntu-xenial-dist
+ variables:
+ CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
+ MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
+ <<: *compile_definition
+
# This snapshot stage job makes sure that the source tarball has all
# it needs to rebuild itself, install everything built and cleans up
# without leaving any droppings behind when uninstalling. The build