From dd31b77c2ace993802abbbedb9026191bc7b2a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Thu, 23 Aug 2018 15:34:01 +0200 Subject: Rename and organize the ci builds --- .gitlab-ci.yml | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4627d94..0554d66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,49 +65,40 @@ build:archlinux: artifacts: paths: [] -build:1: +build:no_botan: variables: BOTAN: "-DWITHOUT_BOTAN=1" <<: *fedora_build -build:2: +build:no_udns: variables: UDNS: "-DWITHOUT_UDNS=1" <<: *fedora_build -build:3: +build:no_libidn: variables: - SQLITE3: "-DWITHOUT_SQLITE3=1" - TEST_POSTGRES_URI: "postgres@postgres/postgres" - services: - - postgres:latest + UDNS: "-DWITHOUT_UDNS=1" <<: *fedora_build -build:4: +build:no_sqlite3: variables: SQLITE3: "-DWITHOUT_SQLITE3=1" - POSTGRESQL: "-DWITHOUT_POSTGRESQL=1" - BOTAN: "-DWITHOUT_BOTAN=1" - LIBIDN: "-DWITHOUT_LIBIDN=1" - <<: *fedora_build - -build:5: - variables: - UDNS: "-DWITHOUT_UDNS=1" TEST_POSTGRES_URI: "postgres@postgres/postgres" services: - postgres:latest <<: *fedora_build -build:6: +build:no_db: variables: - BOTAN: "-DWITHOUT_BOTAN=1" - UDNS: "-DWITHOUT_UDNS=1" + SQLITE3: "-DWITHOUT_SQLITE3=1" + POSTGRESQL: "-DWITHOUT_POSTGRESQL=1" <<: *fedora_build -build:without_udns: +build:no_db_botan: variables: - UDNS: "-DWITHOUT_UDNS=1" + SQLITE3: "-DWITHOUT_SQLITE3=1" + POSTGRESQL: "-DWITHOUT_POSTGRESQL=1" + BOTAN: "-DWITHOUT_BOTAN=1" <<: *fedora_build # @@ -144,11 +135,11 @@ test:fedora: dependencies: - build:fedora -test:without_udns: +test:no_udns: image: docker.louiz.org/louiz/biboumi/test-fedora:latest <<: *basic_test dependencies: - - build:without_udns + - build:no_udns test:alpine: image: docker.louiz.org/louiz/biboumi/test-alpine:latest -- cgit v1.2.3