From 47bbb94946570314bf1bf3ca9b26b6c66245a235 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 13 Apr 2026 14:42:34 +0200 Subject: [PATCH 1/2] fix(ci): remove redundant build jobs Signed-off-by: Alexandra --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d960bf2f..bde333e37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -100,7 +100,7 @@ build:source: CMAKE: cmake parallel: matrix: - - DISTRO: [fedora, fedora-minimal, debian, rocky, rocky9, ubuntu] + - DISTRO: [debian, rocky, rocky9, ubuntu] - DISTRO: fedora CMAKE_EXTRA_OPTS: > -DVILLAS_COMPILE_WARNING_AS_ERROR=ON From 3f38b5d55b8e8837fe3c4adec9b1154997e376d8 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 13 Apr 2026 14:56:23 +0200 Subject: [PATCH 2/2] fix(ci): include build commands in var Signed-off-by: Alexandra --- .gitlab-ci.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bde333e37..d2fe774a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,24 @@ variables: DOCKER_CLI_EXPERIMENTAL: enabled CMAKE_BUILD_OPTS: "--parallel 16" CMAKE_EXTRA_OPTS: "-DCMAKE_BUILD_TYPE=Release" + CMAKE_EXTRA_OPTS_FEDORA_MINIMAL: > + -DVILLAS_COMPILE_WARNING_AS_ERROR=ON + -DWITH_API=OFF + -DWITH_CLIENTS=OFF + -DWITH_CONFIG=OFF + -DWITH_DOC=OFF + -DWITH_FPGA=OFF + -DWITH_GRAPHVIZ=OFF + -DWITH_HOOKS=OFF + -DWITH_LUA=OFF + -DWITH_OPENMP=OFF + -DWITH_PLUGINS=OFF + -DWITH_SRC=OFF + -DWITH_TESTS=OFF + -DWITH_TOOLS=OFF + -DWITH_WEB=OFF + -DCMAKE_MODULE_PATH=/usr/local/lib64/cmake + -DCMAKE_PREFIX_PATH=/usr/local CACHIX_CACHE_NAME: villas stages: @@ -100,29 +118,13 @@ build:source: CMAKE: cmake parallel: matrix: - - DISTRO: [debian, rocky, rocky9, ubuntu] + - DISTRO: [fedora, fedora-minimal, debian, rocky, rocky9, ubuntu] - DISTRO: fedora CMAKE_EXTRA_OPTS: > -DVILLAS_COMPILE_WARNING_AS_ERROR=ON - DISTRO: fedora-minimal CMAKE_EXTRA_OPTS: > - -DVILLAS_COMPILE_WARNING_AS_ERROR=ON - -DWITH_API=OFF - -DWITH_CLIENTS=OFF - -DWITH_CONFIG=OFF - -DWITH_DOC=OFF - -DWITH_FPGA=OFF - -DWITH_GRAPHVIZ=OFF - -DWITH_HOOKS=OFF - -DWITH_LUA=OFF - -DWITH_OPENMP=OFF - -DWITH_PLUGINS=OFF - -DWITH_SRC=OFF - -DWITH_TESTS=OFF - -DWITH_TOOLS=OFF - -DWITH_WEB=OFF - -DCMAKE_MODULE_PATH=/usr/local/lib64/cmake - -DCMAKE_PREFIX_PATH=/usr/local + ${CMAKE_EXTRA_OPTS_FEDORA_MINIMAL} build:nix: <<: *nix