Skip to content

Commit 553d92c

Browse files
committed
Adjusting jdk installation for lxd
1 parent cfae4a6 commit 553d92c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lib/travis/build/bash/travis_install_jdk.bash

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ travis_install_jdk_package_adoptopenjdk() {
5555
if dpkg-query -l adoptopenjdk* >/dev/null 2>&1; then
5656
dpkg-query -l adoptopenjdk* | grep adoptopenjdk | awk '{print $2}' | xargs sudo dpkg -P
5757
fi
58+
if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then
59+
TRAVIS_CPU_ARCH="ppc64el"
60+
fi
5861
wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
5962
sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
6063
sudo apt-get update -yqq
@@ -72,11 +75,11 @@ travis_install_jdk_package_bellsoft() {
7275
if [[ "$JAVA_VERSION" == "8" ]]; then
7376
JAVA_VERSION="1.8.0"
7477
fi
75-
if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
76-
TRAVIS_CPU_ARCH="aarch64"
77-
fi
7878
PACKAGE="bellsoft-java${JAVA_VERSION}"
7979
if ! dpkg -s "$PACKAGE" >/dev/null 2>&1; then
80+
if [[ "${TRAVIS_CPU_ARCH}" == "arm64" ]]; then
81+
TRAVIS_CPU_ARCH="aarch64"
82+
fi
8083
wget -qO - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -
8184
sudo add-apt-repository "deb [arch=$TRAVIS_CPU_ARCH] https://apt.bell-sw.com/ stable main"
8285
sudo apt-get update -yqq

0 commit comments

Comments
 (0)