CI: Drop Debian 8, add Debian 10

This uses the updated Debian images which now use codenames instead
of version numbers.

Note that `CFLAGS=-Werror` has been disabled until such time as all
new warnings have been addressed.
merge-requests/88/head
Olaf Meeuwissen 2019-07-14 14:03:56 +09:00
rodzic 3fb0f02015
commit c52eef6e21
1 zmienionych plików z 18 dodań i 18 usunięć

Wyświetl plik

@ -14,7 +14,7 @@ stages:
- archive - archive
prepare: prepare:
image: $REGISTRY_HUB:debian-9-mini image: $REGISTRY_HUB:debian-stretch-mini
stage: prepare stage: prepare
script: script:
- git ls-files | xargs ./tools/style-check.sh - git ls-files | xargs ./tools/style-check.sh
@ -37,29 +37,15 @@ prepare:
- ./configure $CONFIGURE_OPTS - ./configure $CONFIGURE_OPTS
- make -j2 -k $MAKE_FLAGS - make -j2 -k $MAKE_FLAGS
compile:debian-8-mini:
image: $REGISTRY_HUB:debian-8-mini
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI"
MAKE_FLAGS: "CFLAGS=-Werror"
<<: *compile_definition
compile:debian-8-full:
image: $REGISTRY_HUB:debian-8-full
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
MAKE_FLAGS: "CFLAGS=-Werror"
<<: *compile_definition
compile:debian-9-mini: compile:debian-9-mini:
image: $REGISTRY_HUB:debian-9-mini image: $REGISTRY_HUB:debian-stretch-mini
variables: variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI" CONFIGURE_OPTS: "$CONFIGURE_MINI"
MAKE_FLAGS: "CFLAGS=-Werror" MAKE_FLAGS: "CFLAGS=-Werror"
<<: *compile_definition <<: *compile_definition
compile:debian-9-full: compile:debian-9-full:
image: $REGISTRY_HUB:debian-9-full image: $REGISTRY_HUB:debian-stretch-full
variables: variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
@ -75,6 +61,20 @@ compile:debian-9-full:
- doc/sanei-html - doc/sanei-html
expire_in: 1 day expire_in: 1 day
compile:debian-10-mini:
image: $REGISTRY_HUB:debian-buster-mini
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI"
#MAKE_FLAGS: "CFLAGS=-Werror"
<<: *compile_definition
compile:debian-10-full:
image: $REGISTRY_HUB:debian-buster-full
variables:
CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
#MAKE_FLAGS: "CFLAGS=-Werror"
<<: *compile_definition
compile:fedora-29-clang: compile:fedora-29-clang:
image: $REGISTRY_HUB:fedora-29-clang image: $REGISTRY_HUB:fedora-29-clang
variables: variables:
@ -94,7 +94,7 @@ compile:alpine-3.10-musl:
<<: *compile_definition <<: *compile_definition
archive: archive:
image: $REGISTRY_HUB:debian-9-full image: $REGISTRY_HUB:debian-stretch-full
stage: archive stage: archive
dependencies: dependencies:
- compile:debian-9-full - compile:debian-9-full