From a639bd775d7c2824ca74f78426db40d442797b63 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 17 Oct 2019 21:09:14 +0200 Subject: [PATCH] ci: do not build base template --- .gitlab-ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c21162a8..acc57b3e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ prepare:debian-arm64:docker-dev: # Stage: build ############################################################################## -build:base: +build:fedora:x86_64: stage: build script: - mkdir -p build && cd build @@ -79,35 +79,32 @@ build:base: tags: - docker -build:fedora:x86_64: - extends: build:base - build:fedora-minimal:x86_64: - extends: build:base + extends: build:fedora:x86_64 variables: CMAKE_OPTS: -DWITH_HOOKS=OFF -DWITH_WEB=OFF -DWITH_API=OFF -DWITH_CONFIG=OFF -DWITH_SRC=OFF -DWITH_TOOLS=OFF -DWITH_TESTS=OFF -DWITH_PLUGINS=OFF -DWITH_CLIENTS=OFF -DWITH_DOC=OFF build:ubuntu:x86_64: - extends: build:base + extends: build:fedora:x86_64 variables: DOCKER_IMAGE_DEV: villas/node-dev-ubuntu CMAKE_OPTS: -DCMAKE_MODULE_PATH=/usr/local/lib64/cmake -DCMAKE_PREFIX_PATH=/usr/local build:raspbian:armv6l: - extends: build:base + extends: build:fedora:x86_64 variables: DOCKER_IMAGE_DEV: villas/node-dev-raspbian CMAKE_OPTS: -DWITH_NODE_INFINIBAND=OFF when: manual build:debian-multiarch:armhf: - extends: build:base + extends: build:fedora:x86_64 variables: DOCKER_IMAGE_DEV: villas/node-dev-debian-armhf CMAKE_OPTS: -DCMAKE_TOOLCHAIN_FILE=/debian-armhf.cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib/arm-linux-gnueabihf build:debian-multiarch:arm64: - extends: build:base + extends: build:fedora:x86_64 variables: DOCKER_IMAGE_DEV: villas/node-dev-debian-arm64 CMAKE_OPTS: -DCMAKE_TOOLCHAIN_FILE=/debian-arm64.cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib/aarch64-linux-gnu