diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
| commit | 882fd010527b8d8823f09e19edbed3746265fa08 (patch) | |
| tree | be5c7cace6697afc753c152d13ad5145d0884a42 /.gitlab-ci.yml | |
| parent | 527bedac30eb120915718eb7997e6dacd583512e (diff) | |
| parent | e0d94cf4d39395df1e2c6bb4d967200298c13881 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90df8f3..6334acb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ stages: # Debian GNU/Linux. make-dist: - image: $REGISTRY_HUB:debian-buster-mini + image: $REGISTRY_HUB:debian-bullseye-mini stage: tarball script: - git ls-files | xargs ./tools/style-check.sh @@ -41,26 +41,26 @@ make-dist: - ./configure $CONFIGURE_OPTS - make -j2 -k $MAKE_FLAGS -debian-9-full: - image: $REGISTRY_HUB:debian-stretch-full +debian-10-full: + image: $REGISTRY_HUB:debian-buster-full variables: CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" <<: *compile_definition -debian-10-mini: - image: $REGISTRY_HUB:debian-buster-mini +debian-11-mini: + image: $REGISTRY_HUB:debian-bullseye-mini variables: CONFIGURE_OPTS: "$CONFIGURE_MINI" - MAKE_FLAGS: "CFLAGS=-Werror" + MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" <<: *compile_definition # In addition to the regular compile check, the full Debian stable # environment is used to keep some of the HTML documentation that's # available from our website up-to-date. -debian-10-full: - image: $REGISTRY_HUB:debian-buster-full +debian-11-full: + image: $REGISTRY_HUB:debian-bullseye-full variables: CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" @@ -76,20 +76,23 @@ debian-10-full: - doc/sanei-html expire_in: 1 day -fedora-33-clang: - image: $REGISTRY_HUB:fedora-33-clang +fedora-36-clang: + image: $REGISTRY_HUB:fedora-36-clang variables: CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" + MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" <<: *compile_definition -alpine-3.13-musl: - image: $REGISTRY_HUB:alpine-3.13-musl +alpine-3.15-musl: + image: $REGISTRY_HUB:alpine-3.15-musl variables: CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" + MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" <<: *compile_definition + allow_failure: true -ubuntu-16.04-lts: - image: $REGISTRY_HUB:ubuntu-xenial-dist +ubuntu-22.04-lts: + image: $REGISTRY_HUB:ubuntu-jammy-dist variables: CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL" MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror" @@ -107,10 +110,10 @@ ubuntu-16.04-lts: # hence the dependency. make-distcheck: - image: $REGISTRY_HUB:debian-buster-full + image: $REGISTRY_HUB:debian-bullseye-full stage: snapshot dependencies: - - debian-10-full + - debian-11-full script: - tar xzf sane-backends-*.tar.gz --strip-components=1 - rm sane-backends-*.tar.gz |