From 0ed3f61ec1bce2db994fce6ac1166abb004ec87c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 10 Sep 2021 05:37:34 -0300 Subject: [PATCH] Move GraalVM installation to /tmp --- .circleci/config.yml | 34 ++++++++++---------- script/{download-graalvm => install-graalvm} | 6 ++++ 2 files changed, 23 insertions(+), 17 deletions(-) rename script/{download-graalvm => install-graalvm} (90%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 240ebccb..efa2a70e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,7 @@ jobs: environment: LEIN_ROOT: "true" GRAALVM_VERSION: "21.2.0" - GRAALVM_HOME: /root/repo/graalvm-ce-java11-21.2.0 + GRAALVM_HOME: /tmp/graalvm-ce-java11-21.2.0 BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native BABASHKA_XMX: "-J-Xmx6500m" @@ -102,7 +102,7 @@ jobs: - run: name: Download GraalVM command: | - script/download-graalvm + script/install-graalvm - run: name: Build binary command: | @@ -125,7 +125,7 @@ jobs: - save_cache: paths: - ~/.m2 - - /root/repo/graalvm-ce-java11-21.2.0 + - /tmp/graalvm-ce-java11-21.2.0 key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -141,7 +141,7 @@ jobs: environment: LEIN_ROOT: "true" GRAALVM_VERSION: "21.2.0" - GRAALVM_HOME: /root/repo/graalvm-ce-java11-21.2.0 + GRAALVM_HOME: /tmp/graalvm-ce-java11-21.2.0 BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native BABASHKA_STATIC: "true" @@ -183,7 +183,7 @@ jobs: - run: name: Download GraalVM command: | - script/download-graalvm + script/install-graalvm - run: name: Build binary command: | @@ -206,7 +206,7 @@ jobs: - save_cache: paths: - ~/.m2 - - /root/repo/graalvm-ce-java11-21.2.0 + - /tmp/graalvm-ce-java11-21.2.0 key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -224,7 +224,7 @@ jobs: environment: LEIN_ROOT: "true" GRAALVM_VERSION: "21.2.0" - GRAALVM_HOME: /home/circleci/repo/graalvm-ce-java11-21.2.0 + GRAALVM_HOME: /tmp/graalvm-ce-java11-21.2.0 BABASHKA_PLATFORM: linux # used in release script BABASHKA_ARCH: aarch64 BABASHKA_TEST_ENV: native @@ -261,7 +261,7 @@ jobs: - run: name: Download GraalVM command: | - script/download-graalvm + script/install-graalvm - run: name: Build binary command: | @@ -284,7 +284,7 @@ jobs: - save_cache: paths: - ~/.m2 - - /home/circleci/repo/graalvm-ce-java11-21.2.0 + - /tmp/graalvm-ce-java11-21.2.0 key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -302,7 +302,7 @@ jobs: environment: LEIN_ROOT: "true" GRAALVM_VERSION: "21.2.0" - GRAALVM_HOME: /home/circleci/repo/graalvm-ce-java11-21.2.0 + GRAALVM_HOME: /tmp/graalvm-ce-java11-21.2.0 BABASHKA_PLATFORM: linux # used in release script BABASHKA_ARCH: aarch64 BABASHKA_TEST_ENV: native @@ -341,7 +341,7 @@ jobs: - run: name: Download GraalVM command: | - script/download-graalvm + script/install-graalvm - run: name: Build binary command: | @@ -364,7 +364,7 @@ jobs: - save_cache: paths: - ~/.m2 - - /home/circleci/repo/graalvm-ce-java11-21.2.0 + - /tmp/graalvm-ce-java11-21.2.0 key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -379,7 +379,7 @@ jobs: environment: MACOSX_DEPLOYMENT_TARGET: 10.13 # 10.12 is EOL GRAALVM_VERSION: "21.2.0" - GRAALVM_HOME: /Users/distiller/project/graalvm-ce-java11-21.2.0/Contents/Home + GRAALVM_HOME: /tmp/graalvm-ce-java11-21.2.0/Contents/Home BABASHKA_PLATFORM: macos # used in release script BABASHKA_TEST_ENV: native BABASHKA_XMX: "-J-Xmx6500m" @@ -405,7 +405,7 @@ jobs: - run: name: Download GraalVM command: | - script/download-graalvm + script/install-graalvm - run: name: Build binary command: | @@ -426,7 +426,7 @@ jobs: - save_cache: paths: - ~/.m2 - - /Users/distiller/project/graalvm-ce-java11-21.2.0/Contents/Home + - /tmp/graalvm-ce-java11-21.2.0/Contents/Home key: mac-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -438,7 +438,7 @@ jobs: deploy: resource_class: large docker: - - image: clojure:openjdk-11-lein-2.9.6-bullseye + - image: circleci/clojure:lein-2.9.6 working_directory: ~/repo environment: LEIN_ROOT: "true" @@ -461,7 +461,7 @@ jobs: key: v1-dependencies-{{ checksum "project.clj" }} docker: docker: - - image: circleci/buildpack-deps:stretch + - image: circleci/buildpack-deps:bullseye steps: - checkout - attach_workspace: diff --git a/script/download-graalvm b/script/install-graalvm similarity index 90% rename from script/download-graalvm rename to script/install-graalvm index d20a008f..e5dd67b6 100755 --- a/script/download-graalvm +++ b/script/install-graalvm @@ -2,6 +2,8 @@ set -euo pipefail +INSTALL_DIR="${1:-/tmp}" + GRAALVM_VERSION="${GRAALVM_VERSION:-21.2.0}" case "$BABASHKA_PLATFORM" in @@ -22,8 +24,12 @@ case "${BABASHKA_ARCH:-}" in ;; esac +pushd "$INSTALL_DIR" >/dev/null + if ! [ -d "graalvm-ce-java11-$GRAALVM_VERSION" ]; then echo "Downloading GraalVM $GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION on '$PWD'..." curl -O -sL "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-java11-$GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION.tar.gz" tar xzf graalvm-ce-java11-$GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION.tar.gz fi + +popd >/dev/null