Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'ci-rpm'

Browse Source 
369725faa5 gitlab-ci: add job to run CPack RPM tests
1186ed64d0 ci: add rpm-build to Fedora base image
60380bd77c Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test case
5130ff6878 Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6214
This commit is contained in:
Brad King
2021-06-11 10:10:29 +00:00
committed by Kitware Robot
parent 557e47f154 369725faa5
commit 15b1d5ab9c
6 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -194,6 +194,18 @@ test:fedora34-makefiles:
- .run_dependent
- .needs_centos6_x86_64
test:fedora34-makefiles-nospace:
extends:
- .fedora34_makefiles
- .cmake_test_linux_release
- .linux_builder_tags_qt
- .run_dependent
- .needs_centos6_x86_64
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
CMAKE_CI_BUILD_NAME: fedora34_makefiles_nospace
CMAKE_CI_JOB_NIGHTLY: "true"
test:cuda10.2-nvidia:
extends:
- .cuda10.2_nvidia

4
.gitlab/ci/docker/fedora34/install_deps.sh
View File

@@ -36,6 +36,10 @@ dnf install --setopt=install_weak_deps=False -y \
jq \
which
# Packages needed to test CPack.
dnf install --setopt=install_weak_deps=False -y \
rpm-build
# Packages needed to test find modules.
dnf install --setopt=install_weak_deps=False -y \
alsa-lib-devel \

2
.gitlab/os-linux.yml
View File

@@ -69,7 +69,7 @@
### Fedora
.fedora34:
image: "kitware/cmake:ci-fedora34-x86_64-2021-06-07"
image: "kitware/cmake:ci-fedora34-x86_64-2021-06-10"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"

2
Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
View File

@@ -20,7 +20,7 @@ if(CPACK_GENERATOR MATCHES "RPM")
set(CPACK_RPM_HEADERS_PACKAGE_ARCHITECTURE "noarch")
# test cross-built rpm
set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hf")
set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hl")
# test package summary override - headers rpm is generated in the middle
set(CPACK_RPM_PACKAGE_SUMMARY "default summary")

2
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
View File

@@ -270,7 +270,7 @@ if(CPackGen MATCHES "RPM")
set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
set(check_file_match_expected_architecture "armv7hf")
set(check_file_match_expected_architecture "armv7hl")
set(spec_regex "*applications*")
set(check_content_list "^/usr/foo/bar
/usr/foo/bar/bin

17
Tests/RunCMake/CPack/tests/DEBUGINFO/RPM-COMPONENT-stderr.txt Normal file
View File

@@ -0,0 +1,17 @@
^CMake Warning \(dev\) at [^
]*/Modules/Internal/CPack/CPackRPM.cmake:[0-9]+ \(message\):
CPackRPM:Warning: debuginfo package was requested but will not be generated
as no source files were found! Component: 'appheaders'.
Call Stack \(most recent call first\):
[^
]*/Modules/Internal/CPack/CPackRPM.cmake:[0-9]+ \(cpack_rpm_generate_package\)
This warning is for project developers. Use -Wno-dev to suppress it.
+
CPackRPM: Will use GENERATED spec file: [^
]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-appheaders.spec
CPackRPM: Will use GENERATED spec file: [^
]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-applications.spec
CPackRPM: Will use GENERATED spec file: [^
]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-headers.spec
CPackRPM: Will use GENERATED spec file: [^
]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-libs.spec$