diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 18:45:55 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 18:45:55 +0200 |
| commit | a77bc1fcbdf83cfdac9570c0a0ac886b5534c90f (patch) | |
| tree | d839746371ecb8ed64ac81d2e37c11fcd25a00ac /.gitlab-ci.yml | |
| parent | 787fb1d54ec9ee5fb941ae897fb201feb9cb2fd1 (diff) | |
| parent | 2b3e02411ecc09e7d41741b5587655c9b2f955b7 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
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 |