diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e8d8737..e55c1c0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ jobs: working_directory: ~/repo environment: LEIN_ROOT: "true" - GRAALVM_HOME: /home/circleci/graalvm-ce-19.1.1 + GRAALVM_HOME: /home/circleci/graalvm-ce-19.2.0-dev BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native steps: @@ -69,9 +69,9 @@ jobs: name: Download GraalVM command: | cd ~ - if ! [ -d graalvm-ce-19.1.1 ]; then - curl -O -sL https://github.com/oracle/graal/releases/download/vm-19.1.1/graalvm-ce-linux-amd64-19.1.1.tar.gz - tar xzf graalvm-ce-linux-amd64-19.1.1.tar.gz + if ! [ -d graalvm-ce-19.2.0-dev ]; then + curl -O -sL https://github.com/oracle/graal/releases/download/vm-19.2.0-dev-b01/graalvm-ce-linux-amd64-19.2.0-dev-b01.tar.gz + tar xzf graalvm-ce-linux-amd64-19.2.0-dev-b01.tar.gz fi - run: name: Build binary @@ -93,7 +93,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-19.1.1 + - ~/graalvm-ce-19.2.0-dev key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -102,7 +102,7 @@ jobs: macos: xcode: "9.0" environment: - GRAALVM_HOME: /Users/distiller/graalvm-ce-19.1.1/Contents/Home + GRAALVM_HOME: /Users/distiller/graalvm-ce-19.2.0-dev/Contents/Home BABASHKA_PLATFORM: macos # used in release script BABASHKA_TEST_ENV: native steps: @@ -124,9 +124,9 @@ jobs: command: | cd ~ ls -la - if ! [ -d graalvm-ce-19.1.1 ]; then - curl -O -sL https://github.com/oracle/graal/releases/download/vm-19.1.1/graalvm-ce-darwin-amd64-19.1.1.tar.gz - tar xzf graalvm-ce-darwin-amd64-19.1.1.tar.gz + if ! [ -d graalvm-ce-19.2.0-dev ]; then + curl -O -sL https://github.com/oracle/graal/releases/download/vm-19.2.0-dev-b01/graalvm-ce-darwin-amd64-19.2.0-dev-b01.tar.gz + tar xzf graalvm-ce-darwin-amd64-19.2.0-dev-b01.tar.gz fi - run: name: Build binary @@ -148,7 +148,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-19.1.1 + - ~/graalvm-ce-19.2.0-dev key: mac-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release diff --git a/.gitignore b/.gitignore index 18814153..158a1bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ pom.xml.asc .hg/ /bb .clj-kondo/.cache +/src/sci diff --git a/project.clj b/project.clj index 650113a0..98069f05 100644 --- a/project.clj +++ b/project.clj @@ -9,7 +9,7 @@ :url "http://opensource.org/licenses/eclipse-1.0.php"} :source-paths ["src"] :dependencies [[org.clojure/clojure "1.9.0"] - [borkdude/sci "0.0.7-SNAPSHOT"]] + [borkdude/sci "0.0.7"]] :profiles {:clojure-1.9.0 {:dependencies [[org.clojure/clojure "1.9.0"]]} :clojure-1.10.1 {:dependencies [[org.clojure/clojure "1.10.1"]]} :test {:dependencies [[clj-commons/conch "0.9.2"]]} diff --git a/script/compile b/script/compile index a2ad0ea0..489a88a8 100755 --- a/script/compile +++ b/script/compile @@ -1,14 +1,20 @@ #!/usr/bin/env bash +set -eo pipefail + if [ -z "$GRAALVM_HOME" ]; then echo "Please set GRAALVM_HOME" exit 1 fi -"$GRAALVM_HOME/bin/gu" install native-image +"$GRAALVM_HOME/bin/gu" install native-image || true BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION) +( cd /tmp; git clone https://github.com/borkdude/sci 2> /dev/null || true ) +mkdir -p src/sci +cp -R /tmp/sci/src/* src + lein with-profiles +clojure-1.10.1 do clean, uberjar $GRAALVM_HOME/bin/native-image \ -jar target/babashka-$BABASHKA_VERSION-standalone.jar \