Skip to content

Commit

Permalink
Skip installation of JDK in deboostrap during CI
Browse files Browse the repository at this point in the history
There are no test submissions in Java, so it's not required and only
makes CI slower.
  • Loading branch information
tom93 committed Jan 5, 2024
1 parent e9cd88f commit 876610e
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions script/install/debootstrap.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 876610e

Please sign in to comment.