From 020c08167d6142ecadb728be0dcef2d1ac3945b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armel=20Th=C3=B6ni?= Date: Thu, 4 Dec 2025 10:25:11 +0100 Subject: [PATCH] Fix of gitlab Fedora packaging --- .gitlab-ci.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5584e6a54..3bf733d01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,14 +40,13 @@ pkg-of-no-ui: paths: - /builds/openfluid/incubateur/openfluid/_build_noui/*.deb -pkg-of-full: +pkg-of-full-deb: stage: package when: manual parallel: matrix: - TAG: ["debian-11-qt5", "debian-12-qt6", "debian-13-qt6", - "ubuntu-22.04-qt5", "ubuntu-24.04-qt6", "ubuntu-24.10-qt6", "ubuntu-25.04-qt6", - "fedora-41-qt5", "fedora-42-qt6"] + "ubuntu-22.04-qt5", "ubuntu-24.04-qt6", "ubuntu-24.10-qt6", "ubuntu-25.04-qt6"] image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/$TAG" script: - mkdir ./_build_release @@ -58,6 +57,24 @@ pkg-of-full: paths: - /builds/openfluid/incubateur/openfluid/_build_release/*.deb + +pkg-of-full-rpm: + stage: package + when: manual + parallel: + matrix: + - TAG: ["fedora-41-qt5", "fedora-42-qt6"] + image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/$TAG" + script: + - mkdir ./_build_release + - cd ./_build_release && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + - export QA_SKIP_RPATHS=1 + - make -j `nproc` + - cpack -j `nproc` + artifacts: + paths: + - /builds/openfluid/incubateur/openfluid/_build_release/*.rpm + pkg-bindings-r: stage: downstream image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/debian-12-qt6"