diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f901c2cba637666eb789c1c727fb03e0238b11b..f53c86a2081757e56e709a7416b2ab6b4f1c16c1 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:2.0.3 +image: gitlab-registry.cern.ch/scouting-demonstrator/scouting-docker-images/scdaq-builder:scdaq-python3-support-9d9a61d8 check_formatting: stage: check diff --git a/scripts/scdaqrpm.sh b/scripts/scdaqrpm.sh index 412d01810f02df60dbcd60254dfdb17866689bc9..0acb2eac115b5a47a7137902a35192a334dd08a4 100755 --- a/scripts/scdaqrpm.sh +++ b/scripts/scdaqrpm.sh @@ -19,7 +19,7 @@ fi echo "..Build dependencies OK" echo "" -BUILDSYS=${BUILD_SYSTEM:-make} +BUILDSYS=${BUILD_SYSTEM:-cmake} cd $SCRIPTDIR/.. BASEDIR=$PWD