diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | cmake/Package.cmake | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c30d2d2..2aacbc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,11 +163,11 @@ release_build_for_centos8: ############################################################################### # test ############################################################################### -.setup_test_env_for_centos8: +test_in_centos8: stage: test image: $BUILD_IMAGE_CENTOS8 allow_failure: false - before_script: + script: - *everything_before_script - ls -l /opt/MESA/lib && echo "/opt/MESA/lib" >> /etc/ld.so.conf - cd build; make test diff --git a/cmake/Package.cmake b/cmake/Package.cmake index b6265e3..e9ff57d 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,7 +1,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_PACKAGE_NAME "stellar-debug") + set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-debug) else() - set(CPACK_PACKAGE_NAME "stellar") + set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) endif() message(STATUS "Package: ${CPACK_PACKAGE_NAME}") @@ -25,13 +25,6 @@ set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in) set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in) -# Must uninstall the debug package before install release package -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CPACK_RPM_PACKAGE_CONFLICTS ${PROJECT_NAME}) -else() - set(CPACK_RPM_PACKAGE_CONFLICTS "${PROJECT_NAME}-debug") -endif() - # Setup %config(noreplace) # set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/stellar/stellar.conf") include(CPack) |