Explorar o código

ci: Add OpenJDK to Debian and Fedora base images

This enables the `JavaExportImport` test in CI.
Brad King %!s(int64=3) %!d(string=hai) anos
pai
achega
97f4aa1f05

+ 1 - 0
.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 \

+ 1 - 0
.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 \

+ 1 - 0
.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 \

+ 3 - 3
.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"