From 243b62b3fe3065de010b7bb3281a8dd19cae7724 Mon Sep 17 00:00:00 2001 From: Yann Bouzonie Date: Tue, 13 Feb 2024 09:13:08 +0100 Subject: [PATCH] refactor(build): less aggressive jvm setup (#341) Let's answer no if sdk man is asking to use a new jvm as default --- client/build.sh | 2 +- client/release.sh | 2 +- deps/kiama/build.sh | 2 +- deps/others/build.sh | 2 +- launcher/build.sh | 2 +- python-client/build.sh | 2 +- snapi-client/build.sh | 2 +- snapi-client/release.sh | 2 +- snapi-client/test.sh | 2 +- snapi-frontend/build.sh | 2 +- snapi-frontend/release.sh | 2 +- snapi-frontend/test.sh | 2 +- snapi-parser/build.sh | 2 +- snapi-parser/release.sh | 2 +- snapi-truffle/build.sh | 2 +- snapi-truffle/release.sh | 2 +- sql-client/build.sh | 2 +- sql-client/release.sh | 2 +- sql-client/test.sh | 2 +- utils/build.sh | 2 +- utils/release.sh | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/client/build.sh b/client/build.sh index ba49405f4..b81088658 100755 --- a/client/build.sh +++ b/client/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/client/release.sh b/client/release.sh index be5605ecf..1351609db 100755 --- a/client/release.sh +++ b/client/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/deps/kiama/build.sh b/deps/kiama/build.sh index 2c9eb1fd4..8bbc38e16 100755 --- a/deps/kiama/build.sh +++ b/deps/kiama/build.sh @@ -5,7 +5,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" # reset shell env for later stages [ "$JAVA_OPTS" == "-XX:+UseG1GC" ] && { unset JAVA_OPTS; } -yes | sdk install java 17.0.5-amzn || true +yes n | sdk install java 17.0.5-amzn || true sdk use java 17.0.5-amzn cd "$SCRIPT_HOME" diff --git a/deps/others/build.sh b/deps/others/build.sh index 611c282b6..896247d91 100755 --- a/deps/others/build.sh +++ b/deps/others/build.sh @@ -5,7 +5,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" # reset shell env for later stages [ "$JAVA_OPTS" == "-XX:+UseG1GC" ] && { unset JAVA_OPTS; } -yes | sdk install java 17.0.5-amzn || true +yes n | sdk install java 17.0.5-amzn || true sdk use java 17.0.5-amzn cd "$SCRIPT_HOME" diff --git a/launcher/build.sh b/launcher/build.sh index dbc9da9c9..91906feee 100755 --- a/launcher/build.sh +++ b/launcher/build.sh @@ -5,7 +5,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" set -e -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce client_version=$(cat $SCRIPT_HOME/../client/version) diff --git a/python-client/build.sh b/python-client/build.sh index ba49405f4..b81088658 100755 --- a/python-client/build.sh +++ b/python-client/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-client/build.sh b/snapi-client/build.sh index ba49405f4..b81088658 100755 --- a/snapi-client/build.sh +++ b/snapi-client/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-client/release.sh b/snapi-client/release.sh index be5605ecf..1351609db 100755 --- a/snapi-client/release.sh +++ b/snapi-client/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-client/test.sh b/snapi-client/test.sh index 2077050c8..bd4adfbb5 100755 --- a/snapi-client/test.sh +++ b/snapi-client/test.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce # snapi-frontend diff --git a/snapi-frontend/build.sh b/snapi-frontend/build.sh index ba49405f4..b81088658 100755 --- a/snapi-frontend/build.sh +++ b/snapi-frontend/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-frontend/release.sh b/snapi-frontend/release.sh index be5605ecf..1351609db 100755 --- a/snapi-frontend/release.sh +++ b/snapi-frontend/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-frontend/test.sh b/snapi-frontend/test.sh index 2077050c8..bd4adfbb5 100755 --- a/snapi-frontend/test.sh +++ b/snapi-frontend/test.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce # snapi-frontend diff --git a/snapi-parser/build.sh b/snapi-parser/build.sh index b7b58596a..2458f440d 100755 --- a/snapi-parser/build.sh +++ b/snapi-parser/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21-graalce || true +yes n | sdk install java 21-graalce || true sdk use java 21-graalce cd "$SCRIPT_HOME" diff --git a/snapi-parser/release.sh b/snapi-parser/release.sh index be5605ecf..1351609db 100755 --- a/snapi-parser/release.sh +++ b/snapi-parser/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-truffle/build.sh b/snapi-truffle/build.sh index ba49405f4..b81088658 100755 --- a/snapi-truffle/build.sh +++ b/snapi-truffle/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/snapi-truffle/release.sh b/snapi-truffle/release.sh index be5605ecf..1351609db 100755 --- a/snapi-truffle/release.sh +++ b/snapi-truffle/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/sql-client/build.sh b/sql-client/build.sh index ba49405f4..b81088658 100755 --- a/sql-client/build.sh +++ b/sql-client/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/sql-client/release.sh b/sql-client/release.sh index be5605ecf..1351609db 100755 --- a/sql-client/release.sh +++ b/sql-client/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/sql-client/test.sh b/sql-client/test.sh index 2077050c8..bd4adfbb5 100755 --- a/sql-client/test.sh +++ b/sql-client/test.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce # snapi-frontend diff --git a/utils/build.sh b/utils/build.sh index ba49405f4..b81088658 100755 --- a/utils/build.sh +++ b/utils/build.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" diff --git a/utils/release.sh b/utils/release.sh index be5605ecf..1351609db 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -3,7 +3,7 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" [ "$CI" == "true" ] && { export HOME=/home/sbtuser; } . ~/.sdkman/bin/sdkman-init.sh -yes | sdk install java 21.0.1-graalce || true +yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME"