From 7ea3a4af170497d1f25f01e0bef6eb4fa118c7e6 Mon Sep 17 00:00:00 2001
From: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Date: Thu, 31 Mar 2022 10:15:15 +0200
Subject: [PATCH] gitlab-ci: drop dependency on cmake3
---
.gitlab-ci.yml | 6 +++---
cmake/UseRPMTools.cmake | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4102eac648..a8c4b98fb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ cta_srpm:
retry: 1
image: gitlab-registry.cern.ch/linuxsupport/cc7-base
script:
- - yum install -y devtoolset-8 cmake cmake3 make rpm-build
+ - yum install -y devtoolset-8 cmake3 make rpm-build
- source /opt/rh/devtoolset-8/enable
- mkdir build_srpm
- cd build_srpm
@@ -45,7 +45,7 @@ cta_rpm:
image: gitlab-registry.cern.ch/linuxsupport/cc7-base
script:
- cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/*.repo /etc/yum.repos.d/
- - yum install -y devtoolset-8 cmake cmake3 make rpm-build
+ - yum install -y devtoolset-8 cmake3 make rpm-build
- yum -y install yum-plugin-priorities yum-plugin-versionlock
- yum install -y git
- source /opt/rh/devtoolset-8/enable
@@ -76,7 +76,7 @@ cta_tagged_rpm:
- if [ -z "${CI_COMMIT_TAG}" ]; then echo "This is not a tagged commit, exiting"; exit 0; fi
- echo "Building package for tag ${CI_COMMIT_TAG}. CTA_VERSION=${TAG_VERSION} - CTA_RELEASE=${TAG_RELEASE}"
- cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/*.repo /etc/yum.repos.d/
- - yum install -y devtoolset-8 cmake cmake3 make rpm-build
+ - yum install -y devtoolset-8 cmake3 make rpm-build
- yum -y install yum-plugin-priorities yum-plugin-versionlock
- yum install -y git
- source /opt/rh/devtoolset-8/enable
diff --git a/cmake/UseRPMTools.cmake b/cmake/UseRPMTools.cmake
index 2ab6553d4f..ed14b77e31 100644
--- a/cmake/UseRPMTools.cmake
+++ b/cmake/UseRPMTools.cmake
@@ -159,13 +159,13 @@ rm -rf build_tree
ENDIF("${ARGV1}" STREQUAL "")
ADD_CUSTOM_TARGET(${RPMNAME}_srpm
- COMMAND cpack -G TGZ --config CPackSourceConfig.cmake
+ COMMAND cpack3 -G TGZ --config CPackSourceConfig.cmake
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz ${RPM_ROOTDIR}/SOURCES
COMMAND ${RPMTools_RPMBUILD_EXECUTABLE} -bs --define=\"_topdir ${RPM_ROOTDIR}\" --define '_source_filedigest_algorithm md5' --define '_binary_filedigest_algorithm md5' --define 'neutralpackage 1' --nodeps --buildroot=${RPM_ROOTDIR}/tmp ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}
)
ADD_CUSTOM_TARGET(${RPMNAME}_rpm
- COMMAND cpack -G TGZ --config CPackSourceConfig.cmake
+ COMMAND cpack3 -G TGZ --config CPackSourceConfig.cmake
COMMAND ${CMAKE_COMMAND} -E copy ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz ${RPM_ROOTDIR}/SOURCES
COMMAND ${RPMTools_RPMBUILD_EXECUTABLE} -bb --define=\"_topdir ${RPM_ROOTDIR}\" $ENV{RPMDEFS} --buildroot=${RPM_ROOTDIR}/tmp ${RPM_ROOTDIR}/SPECS/${SPECFILE_NAME}
)
--
GitLab