From 084ba8366642ed1c50324fc4558bb95ba0146596 Mon Sep 17 00:00:00 2001
From: Giovanna Lazzari Miotto <giovanna.lazzari.miotto@cern.ch>
Date: Tue, 21 Nov 2023 14:57:15 +0100
Subject: [PATCH] [ci] Move to CS7 tag 1.0.5
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d55a7e23..fa125e2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gitlab-registry.cern.ch/scouting-demonstrator/scouting-docker-images/scdaq-builder:1.0.4
+image: gitlab-registry.cern.ch/scouting-demonstrator/scouting-docker-images/scdaq-builder:1.0.5
check_formatting:
stage: check
@@ -32,7 +32,7 @@ build_rpm_tag:
only:
- tags
script:
- - bash scripts/scdaqrpm.sh
+ - BUILD_SYSTEM=cmake bash scripts/scdaqrpm.sh
- mv /tmp/scdaq-build-tmp/RPMBUILD/RPMS/x86_64/scdaq* .
artifacts:
name: "scdaq-${CI_JOB_NAME}_${CI_COMMIT_TAG}"
@@ -45,7 +45,7 @@ build_rpm_dev:
except:
- tags
script:
- - bash scripts/scdaqrpm.sh
+ - BUILD_SYSTEM=cmake bash scripts/scdaqrpm.sh
- mv /tmp/scdaq-build-tmp/RPMBUILD/RPMS/x86_64/scdaq* .
- for f in *.rpm; do mv -- "$f" "${f%.rpm}-dev.rpm"; done # Add -dev extension to RPMs built from non-tags.
artifacts:
--
GitLab