diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-11 10:10:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-11 10:10:34 (GMT) |
| commit | 15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7 (patch) | |
| tree | 1539761ed59663e710b394b74f639d2e8c01a94c /.gitlab | |
| parent | 557e47f1544796332bf27a73669a429725adac29 (diff) | |
| parent | 369725faa5e410ca5fdc51c84e4f11af73b13ade (diff) | |
| download | CMake-15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7.zip CMake-15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7.tar.gz CMake-15b1d5ab9cdb8cafe74d0a30ca46d6a06e1838b7.tar.bz2 | |
Merge topic 'ci-rpm'
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
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/docker/fedora34/install_deps.sh | 4 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh index 146d51f..1992373 100755 --- a/.gitlab/ci/docker/fedora34/install_deps.sh +++ b/.gitlab/ci/docker/fedora34/install_deps.sh @@ -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 \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 997beab..6b490be 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -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" |