aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-03-03 16:28:05 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-03-03 17:52:43 -0500
commite082f268bdfe2351bf7fc68733a1dda8e2f7ac5a (patch)
tree95e72d31e760a491fa5d4a4cbe5d3700582756cb
parent5e4ea9f0f444120e566e364aba0b12f2520bd9ac (diff)
downloadmeson-e082f268bdfe2351bf7fc68733a1dda8e2f7ac5a.zip
meson-e082f268bdfe2351bf7fc68733a1dda8e2f7ac5a.tar.gz
meson-e082f268bdfe2351bf7fc68733a1dda8e2f7ac5a.tar.bz2
CI images: add the JRE to Ubuntu
This is needed in order to test a pending improvement to the jni dependency in #10048.
-rwxr-xr-xci/ciimage/bionic/install.sh1
-rwxr-xr-xci/ciimage/ubuntu-rolling/install.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/ci/ciimage/bionic/install.sh b/ci/ciimage/bionic/install.sh
index 74b407f..23e0774 100755
--- a/ci/ciimage/bionic/install.sh
+++ b/ci/ciimage/bionic/install.sh
@@ -27,6 +27,7 @@ pkgs=(
libblocksruntime-dev
libperl-dev libscalapack-mpi-dev libncurses-dev
itstool
+ openjdk-11-jre
)
boost_pkgs=(atomic chrono date-time filesystem log regex serialization system test thread)
diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
index aa73cbc..550d311 100755
--- a/ci/ciimage/ubuntu-rolling/install.sh
+++ b/ci/ciimage/ubuntu-rolling/install.sh
@@ -26,6 +26,7 @@ pkgs=(
liblapack-dev libscalapack-mpi-dev
bindgen
itstool
+ openjdk-11-jre
)
sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list"