summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2019-09-13 09:40:55 +0200
committerlouiz’ <louiz@louiz.org>2019-09-15 21:41:39 +0200
commitc392d7127fbf4a5e6d9830014a02fbaa358ba883 (patch)
treef32fab9da6f13e40f7cbbcc8bd2e0139ed140481
parent9ed6442fc1f688acdf87e32fd39ff011697f6acb (diff)
downloadbiboumi-c392d7127fbf4a5e6d9830014a02fbaa358ba883.tar.gz
biboumi-c392d7127fbf4a5e6d9830014a02fbaa358ba883.tar.bz2
biboumi-c392d7127fbf4a5e6d9830014a02fbaa358ba883.tar.xz
biboumi-c392d7127fbf4a5e6d9830014a02fbaa358ba883.zip
ci: use the "extends" key instead of the ugly anchor syntax
-rw-r--r--.gitlab-ci.yml36
1 files changed, 18 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a55b483..1a073f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
## Build jobs
#
-.template:basic_build: &basic_build
+.basic_build:
stage: build
tags:
- docker
@@ -38,25 +38,25 @@ variables:
paths:
- build/
-.template:fedora_build: &fedora_build
- <<: *basic_build
+.fedora_build:
+ extends: .basic_build
image: docker.louiz.org/louiz/biboumi/test-fedora:latest
build:fedora:
- <<: *fedora_build
+ extends: .fedora_build
build:debian:
- <<: *basic_build
+ extends: .basic_build
image: docker.louiz.org/louiz/biboumi/test-debian:latest
build:alpine:
+ extends: .basic_build
variables:
SYSTEMD: "-DWITHOUT_SYSTEMD=1"
- <<: *basic_build
image: docker.louiz.org/louiz/biboumi/test-alpine:latest
build:archlinux:
- <<: *basic_build
+ extends: .basic_build
only:
- branches@louiz/biboumi
- triggers
@@ -66,46 +66,46 @@ build:archlinux:
paths: []
build:no_botan:
+ extends: .fedora_build
variables:
BOTAN: "-DWITHOUT_BOTAN=1"
- <<: *fedora_build
build:no_udns:
+ extends: .fedora_build
variables:
UDNS: "-DWITHOUT_UDNS=1"
- <<: *fedora_build
build:no_libidn:
+ extends: .fedora_build
variables:
UDNS: "-DWITHOUT_UDNS=1"
- <<: *fedora_build
build:no_sqlite3:
+ extends: .fedora_build
variables:
SQLITE3: "-DWITHOUT_SQLITE3=1"
TEST_POSTGRES_URI: "postgres@postgres/postgres"
services:
- postgres:latest
- <<: *fedora_build
build:no_db:
+ extends: .fedora_build
variables:
SQLITE3: "-DWITHOUT_SQLITE3=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
- <<: *fedora_build
build:no_db_botan:
+ extends: .fedora_build
variables:
SQLITE3: "-DWITHOUT_SQLITE3=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
BOTAN: "-DWITHOUT_BOTAN=1"
- <<: *fedora_build
#
## Test jobs
#
-.template:basic_test: &basic_test
+.basic_test:
stage: test
tags:
- docker
@@ -115,15 +115,15 @@ build:no_db_botan:
- make e2e -j$(nproc || echo 1)
test:debian:
+ extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-debian:latest
- <<: *basic_test
dependencies:
- build:debian
needs: ["build:debian"]
test:fedora:
+ extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-fedora:latest
- <<: *basic_test
script:
- cd build/
- make coverage_check -j$(nproc || echo 1)
@@ -143,15 +143,15 @@ test:fedora:
name: $CI_PROJECT_NAME-test-$CI_JOB_ID
test:no_udns:
+ extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-fedora:latest
- <<: *basic_test
dependencies:
- build:no_udns
needs: ["build:no_udns"]
test:alpine:
+ extends: .basic_test
image: docker.louiz.org/louiz/biboumi/test-alpine:latest
- <<: *basic_test
dependencies:
- build:alpine
needs: ["build:alpine"]