diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-22 14:22:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-04-22 14:24:29 (GMT) |
| commit | 2228e545e1ebc9d1ab4930cdf2bc4123f45a1d11 (patch) | |
| tree | d8dd887fd4573e39015f8edb84b9613cfaa26bb7 | |
| parent | bcd98b5f9846d7b9d2a6518501eb7ac56139665e (diff) | |
| download | CMake-2228e545e1ebc9d1ab4930cdf2bc4123f45a1d11.zip CMake-2228e545e1ebc9d1ab4930cdf2bc4123f45a1d11.tar.gz CMake-2228e545e1ebc9d1ab4930cdf2bc4123f45a1d11.tar.bz2 | |
ci: Add libicu to Debian and Fedora base images
| -rwxr-xr-x | .gitlab/ci/docker/debian10-aarch64/install_deps.sh | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/debian10/install_deps.sh | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora35/install_deps.sh | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 6 |
4 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh index 6e9aa0f..f0228f8 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh @@ -58,6 +58,7 @@ apt-get install -y \ libgsl-dev \ libgtest-dev \ libgtk2.0-dev \ + libicu-dev \ libinput-dev \ libjpeg-dev \ libjsoncpp-dev \ diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index f858037..9f50585 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -62,6 +62,7 @@ apt-get install -y \ libgsl-dev \ libgtest-dev \ libgtk2.0-dev \ + libicu-dev \ libinput-dev \ libjpeg-dev \ libjsoncpp-dev \ diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh index 3cc5ed5..13c70e6 100755 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ b/.gitlab/ci/docker/fedora35/install_deps.sh @@ -74,6 +74,7 @@ dnf install --setopt=install_weak_deps=False -y \ lapack-devel \ libarchive-devel \ libcurl-devel \ + libicu-devel \ libinput-devel systemd-devel \ libjpeg-turbo-devel \ libpng-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 60a11b0..f9af14f 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -45,7 +45,7 @@ ### Debian .debian10: - image: "kitware/cmake:ci-debian10-x86_64-2022-03-16" + image: "kitware/cmake:ci-debian10-x86_64-2022-04-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -60,7 +60,7 @@ CMAKE_CI_NO_INSTALL: 1 .debian10_aarch64: - image: "kitware/cmake:ci-debian10-aarch64-2022-03-16" + image: "kitware/cmake:ci-debian10-aarch64-2022-04-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -69,7 +69,7 @@ ### Fedora .fedora35: - image: "kitware/cmake:ci-fedora35-x86_64-2022-03-16" + image: "kitware/cmake:ci-fedora35-x86_64-2022-04-22" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" |