diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-21 17:20:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-21 17:20:17 (GMT) |
| commit | 77d261aec140444c2c4650bc1724708e050d3a6b (patch) | |
| tree | 33df12fc1ae03b46300742bfea71a71e106d1ab1 | |
| parent | 2d3114c9b82a9763cdd3caaee44a202b71b5baeb (diff) | |
| parent | 2bc0708c39470d6ce612047d9864c1bbf2e67304 (diff) | |
| download | CMake-77d261aec140444c2c4650bc1724708e050d3a6b.zip CMake-77d261aec140444c2c4650bc1724708e050d3a6b.tar.gz CMake-77d261aec140444c2c4650bc1724708e050d3a6b.tar.bz2 | |
Merge topic 'ci-fedora34-mpi'
2bc0708c39 ci: Switch to MPICH in Fedora jobs
ef25359eda ci: add MPICH to Fedora base image
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6152
| -rwxr-xr-x | .gitlab/ci/docker/fedora34/install_deps.sh | 1 | ||||
| -rw-r--r-- | .gitlab/ci/env_fedora34_makefiles.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh index ece0666..dfd7db8 100755 --- a/.gitlab/ci/docker/fedora34/install_deps.sh +++ b/.gitlab/ci/docker/fedora34/install_deps.sh @@ -68,6 +68,7 @@ dnf install --setopt=install_weak_deps=False -y \ libuv-devel \ libxml2-devel \ libxslt-devel \ + mpich-devel \ openmpi-devel \ patch \ perl \ diff --git a/.gitlab/ci/env_fedora34_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake index 1d0efa7..aa84e23 100644 --- a/.gitlab/ci/env_fedora34_makefiles.cmake +++ b/.gitlab/ci/env_fedora34_makefiles.cmake @@ -1,2 +1,2 @@ set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0") -set(ENV{PATH} "/usr/lib64/openmpi/bin:$ENV{PATH}") +set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 1bf4098..dcaa643 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-05-10" + image: "kitware/cmake:ci-fedora34-x86_64-2021-05-21" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" |