From 07fa028dec10d670ddd9b8125721d9459baebdf5 Mon Sep 17 00:00:00 2001 From: Tom Levy Date: Wed, 26 Feb 2020 00:32:10 +1300 Subject: [PATCH] Skip installation of JDK in deboostrap during CI (#248) There are no test submissions in Java, so it's not required and only makes CI slower. --- script/install/debootstrap.bash | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/script/install/debootstrap.bash b/script/install/debootstrap.bash index 7324634d..4fa725a3 100644 --- a/script/install/debootstrap.bash +++ b/script/install/debootstrap.bash @@ -113,17 +113,20 @@ chroot "$ISOLATE_ROOT" apt-get install ruby # Ruby (ruby) # LD_ORIGIN_PATH.) } -if ! chroot "$ISOLATE_ROOT" apt-cache show openjdk-11-jdk-headless &>/dev/null; then - # add java ppa - echo "$chroot_cmd add-apt-repository ppa:openjdk-r/ppa -y" - chroot "$ISOLATE_ROOT" add-apt-repository ppa:openjdk-r/ppa -y - - echo "$chroot_cmd apt-get update" - chroot "$ISOLATE_ROOT" apt-get update -fi +[ -z "$CI" ] && { # if not in CI + # Java + if ! chroot "$ISOLATE_ROOT" apt-cache show openjdk-11-jdk-headless &>/dev/null; then + # add java ppa + echo "$chroot_cmd add-apt-repository ppa:openjdk-r/ppa -y" + chroot "$ISOLATE_ROOT" add-apt-repository ppa:openjdk-r/ppa -y + + echo "$chroot_cmd apt-get update" + chroot "$ISOLATE_ROOT" apt-get update + fi -echo "$chroot_install openjdk-11-jdk-headless" -chroot "$ISOLATE_ROOT" apt-get install openjdk-11-jdk-headless # Java + echo "$chroot_install openjdk-11-jdk-headless" + chroot "$ISOLATE_ROOT" apt-get install openjdk-11-jdk-headless # Java +} [ -z "$CI" ] && { # if not in CI