diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-10 13:31:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-06-10 18:44:02 (GMT) |
| commit | 1186ed64d0b11c6ad34010bec0cc028780a7181e (patch) | |
| tree | 7c26c41d491d560655eb74a1f921b887e92ce358 /.gitlab | |
| parent | 60380bd77c93758774eb372c81c79fdf6557cffa (diff) | |
| download | CMake-1186ed64d0b11c6ad34010bec0cc028780a7181e.zip CMake-1186ed64d0b11c6ad34010bec0cc028780a7181e.tar.gz CMake-1186ed64d0b11c6ad34010bec0cc028780a7181e.tar.bz2 | |
ci: add rpm-build to Fedora base image
This is needed to test the CPack RPM generator.
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" |