diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-16 17:51:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-21 20:30:58 (GMT) |
| commit | 97f4aa1f050a6a03e2bb2c1abe5fce49c13e7252 (patch) | |
| tree | 800f032f2a5265cd6cbfd54412693dea30bfd47a /.gitlab | |
| parent | 78d0613695c76609f5889660e1bc51cbbd4480d7 (diff) | |
| download | CMake-97f4aa1f050a6a03e2bb2c1abe5fce49c13e7252.zip CMake-97f4aa1f050a6a03e2bb2c1abe5fce49c13e7252.tar.gz CMake-97f4aa1f050a6a03e2bb2c1abe5fce49c13e7252.tar.bz2 | |
ci: Add OpenJDK to Debian and Fedora base images
This enables the `JavaExportImport` test in CI.
Diffstat (limited to '.gitlab')
| -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 21f0b16..6e9aa0f 100755 --- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh +++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh @@ -76,6 +76,7 @@ apt-get install -y \ libxerces-c-dev \ libxml2-dev libxml2-utils \ libxslt-dev xsltproc \ + openjdk-11-jdk \ python2 python2-dev python-numpy pypy pypy-dev \ python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv \ qtbase5-dev qtbase5-dev-tools \ diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh index 0e5dcad..f858037 100755 --- a/.gitlab/ci/docker/debian10/install_deps.sh +++ b/.gitlab/ci/docker/debian10/install_deps.sh @@ -80,6 +80,7 @@ apt-get install -y \ libxerces-c-dev \ libxml2-dev libxml2-utils \ libxslt-dev xsltproc \ + openjdk-11-jdk \ python2 python2-dev python-numpy pypy pypy-dev \ python3 python3-dev python3-numpy pypy3 pypy3-dev python3-venv \ qtbase5-dev qtbase5-dev-tools \ diff --git a/.gitlab/ci/docker/fedora35/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh index 8d636cf..3cc5ed5 100755 --- a/.gitlab/ci/docker/fedora35/install_deps.sh +++ b/.gitlab/ci/docker/fedora35/install_deps.sh @@ -69,6 +69,7 @@ dnf install --setopt=install_weak_deps=False -y \ gsl-devel \ gtest-devel \ gtk2-devel \ + java-11-openjdk-devel \ jsoncpp-devel \ lapack-devel \ libarchive-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 30b4fc3..4f0fda4 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-02-25" + image: "kitware/cmake:ci-debian10-x86_64-2022-03-16" 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-02-21" + image: "kitware/cmake:ci-debian10-aarch64-2022-03-16" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" @@ -69,7 +69,7 @@ ### Fedora .fedora35: - image: "kitware/cmake:ci-fedora35-x86_64-2022-02-21" + image: "kitware/cmake:ci-fedora35-x86_64-2022-03-16" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" |