luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump to GraalVM 21.3.0 JVM 11

Browse source
This commit is contained in:
Michiel Borkent 2021-11-04 11:01:41 +01:00
parent 19415f6363
commit a9cc6e301e
7 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.circleci/config.yml
View file

@ -69,8 +69,8 @@ jobs:
working_directory: ~/repo working_directory: ~/repo
environment: environment:
LEIN_ROOT: "true" LEIN_ROOT: "true"
GRAALVM_VERSION: "21.2.0" GRAALVM_VERSION: "21.3.0"
GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.2.0 GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0
BABASHKA_PLATFORM: linux # used in release script BABASHKA_PLATFORM: linux # used in release script
BABASHKA_TEST_ENV: native BABASHKA_TEST_ENV: native
BABASHKA_XMX: "-J-Xmx6500m" BABASHKA_XMX: "-J-Xmx6500m"
@ -120,7 +120,7 @@ jobs:
- save_cache: - save_cache:
paths: paths:
- ~/.m2 - ~/.m2
- ~/graalvm-ce-java11-21.2.0 - ~/graalvm-ce-java11-21.3.0
key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
- store_artifacts: - store_artifacts:
path: /tmp/release path: /tmp/release
@ -135,8 +135,8 @@ jobs:
working_directory: ~/repo working_directory: ~/repo
environment: environment:
LEIN_ROOT: "true" LEIN_ROOT: "true"
GRAALVM_VERSION: "21.2.0" GRAALVM_VERSION: "21.3.0"
GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.2.0 GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0
BABASHKA_PLATFORM: linux # used in release script BABASHKA_PLATFORM: linux # used in release script
BABASHKA_TEST_ENV: native BABASHKA_TEST_ENV: native
BABASHKA_STATIC: "true" BABASHKA_STATIC: "true"
@ -199,7 +199,7 @@ jobs:
- save_cache: - save_cache:
paths: paths:
- ~/.m2 - ~/.m2
- ~/graalvm-ce-java11-21.2.0 - ~/graalvm-ce-java11-21.3.0
key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
- store_artifacts: - store_artifacts:
path: /tmp/release path: /tmp/release
@ -216,8 +216,8 @@ jobs:
working_directory: ~/repo working_directory: ~/repo
environment: environment:
LEIN_ROOT: "true" LEIN_ROOT: "true"
GRAALVM_VERSION: "21.2.0" GRAALVM_VERSION: "21.3.0"
GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.2.0 GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0
BABASHKA_PLATFORM: linux # used in release script BABASHKA_PLATFORM: linux # used in release script
BABASHKA_ARCH: aarch64 BABASHKA_ARCH: aarch64
BABASHKA_TEST_ENV: native BABASHKA_TEST_ENV: native
@ -275,7 +275,7 @@ jobs:
- save_cache: - save_cache:
paths: paths:
- ~/.m2 - ~/.m2
- ~/graalvm-ce-java11-21.2.0 - ~/graalvm-ce-java11-21.3.0
key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
- store_artifacts: - store_artifacts:
path: /tmp/release path: /tmp/release
@ -292,8 +292,8 @@ jobs:
working_directory: ~/repo working_directory: ~/repo
environment: environment:
LEIN_ROOT: "true" LEIN_ROOT: "true"
GRAALVM_VERSION: "21.2.0" GRAALVM_VERSION: "21.3.0"
GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.2.0 GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0
BABASHKA_PLATFORM: linux # used in release script BABASHKA_PLATFORM: linux # used in release script
BABASHKA_ARCH: aarch64 BABASHKA_ARCH: aarch64
BABASHKA_TEST_ENV: native BABASHKA_TEST_ENV: native
@ -353,7 +353,7 @@ jobs:
- save_cache: - save_cache:
paths: paths:
- ~/.m2 - ~/.m2
- ~/graalvm-ce-java11-21.2.0 - ~/graalvm-ce-java11-21.3.0
key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
- store_artifacts: - store_artifacts:
path: /tmp/release path: /tmp/release
@ -367,8 +367,8 @@ jobs:
xcode: "12.0.0" xcode: "12.0.0"
environment: environment:
MACOSX_DEPLOYMENT_TARGET: 10.13 # 10.12 is EOL MACOSX_DEPLOYMENT_TARGET: 10.13 # 10.12 is EOL
GRAALVM_VERSION: "21.2.0" GRAALVM_VERSION: "21.3.0"
GRAALVM_HOME: /Users/distiller/graalvm-ce-java11-21.2.0/Contents/Home GRAALVM_HOME: /Users/distiller/graalvm-ce-java11-21.3.0/Contents/Home
BABASHKA_PLATFORM: macos # used in release script BABASHKA_PLATFORM: macos # used in release script
BABASHKA_TEST_ENV: native BABASHKA_TEST_ENV: native
BABASHKA_XMX: "-J-Xmx6500m" BABASHKA_XMX: "-J-Xmx6500m"
@ -415,7 +415,7 @@ jobs:
- save_cache: - save_cache:
paths: paths:
- ~/.m2 - ~/.m2
- ~/graalvm-ce-java11-21.2.0/Contents/Home - ~/graalvm-ce-java11-21.3.0/Contents/Home
key: mac-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} key: mac-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
- store_artifacts: - store_artifacts:
path: /tmp/release path: /tmp/release

72
.github/workflows/build.yml vendored
View file

@ -45,17 +45,17 @@ jobs:
uses: actions/cache@v1 uses: actions/cache@v1
id: cache-graalvm id: cache-graalvm
with: with:
path: ~/graalvm-ce-java11-21.2.0 path: ~/graalvm-ce-java11-21.3.0
key: ${{ runner.os }}-graalvm-21.2.0 key: ${{ runner.os }}-graalvm-21.3.0
restore-keys: | restore-keys: |
${{ runner.os }}-graalvm-21.2.0 ${{ runner.os }}-graalvm-21.3.0
- name: Download GraalVM - name: Download GraalVM
run: | run: |
cd ~ cd ~
if ! [ -d graalvm-ce-java11-21.2.0 ]; then if ! [ -d graalvm-ce-java11-21.3.0 ]; then
curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.2.0/graalvm-ce-java11-linux-amd64-21.2.0.tar.gz curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
tar xzf graalvm-ce-java11-linux-amd64-21.2.0.tar.gz tar xzf graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
fi fi
- name: Fetch deps - name: Fetch deps
@ -65,18 +65,18 @@ jobs:
- name: Run tests - name: Run tests
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
script/test script/test
- name: Test libraries - name: Test libraries
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
sudo script/install-clojure sudo script/install-clojure
script/run_lib_tests script/run_lib_tests
- name: Build uberjar - name: Build uberjar
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
script/uberjar script/uberjar
- name: Babashka version - name: Babashka version
@ -119,17 +119,17 @@ jobs:
uses: actions/cache@v1 uses: actions/cache@v1
id: cache-graalvm id: cache-graalvm
with: with:
path: ~/graalvm-ce-java11-21.2.0 path: ~/graalvm-ce-java11-21.3.0
key: ${{ runner.os }}-graalvm-21.2.0 key: ${{ runner.os }}-graalvm-21.3.0
restore-keys: | restore-keys: |
${{ runner.os }}-graalvm-21.2.0 ${{ runner.os }}-graalvm-21.3.0
- name: Download GraalVM - name: Download GraalVM
run: | run: |
cd ~ cd ~
if ! [ -d graalvm-ce-java11-21.2.0 ]; then if ! [ -d graalvm-ce-java11-21.3.0 ]; then
curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.2.0/graalvm-ce-java11-linux-amd64-21.2.0.tar.gz curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
tar xzf graalvm-ce-java11-linux-amd64-21.2.0.tar.gz tar xzf graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
fi fi
- name: Babashka version - name: Babashka version
@ -142,12 +142,12 @@ jobs:
run: | run: |
export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar
export BABASHKA_XMX="-J-Xmx6g" export BABASHKA_XMX="-J-Xmx6g"
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
script/compile script/compile
- name: Test binary - name: Test binary
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
BABASHKA_TEST_ENV=native script/test BABASHKA_TEST_ENV=native script/test
- name: Install clojure - name: Install clojure
@ -156,7 +156,7 @@ jobs:
- name: Test libraries - name: Test libraries
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
BABASHKA_TEST_ENV=native script/run_lib_tests BABASHKA_TEST_ENV=native script/run_lib_tests
- name: Upload artifact - name: Upload artifact
@ -194,17 +194,17 @@ jobs:
uses: actions/cache@v1 uses: actions/cache@v1
id: cache-graalvm id: cache-graalvm
with: with:
path: ~/graalvm-ce-java11-21.2.0 path: ~/graalvm-ce-java11-21.3.0
key: ${{ runner.os }}-graalvm-21.2.0 key: ${{ runner.os }}-graalvm-21.3.0
restore-keys: | restore-keys: |
${{ runner.os }}-graalvm-21.2.0 ${{ runner.os }}-graalvm-21.3.0
- name: Download GraalVM - name: Download GraalVM
run: | run: |
cd ~ cd ~
if ! [ -d graalvm-ce-java11-21.2.0 ]; then if ! [ -d graalvm-ce-java11-21.3.0 ]; then
curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.2.0/graalvm-ce-java11-linux-amd64-21.2.0.tar.gz curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
tar xzf graalvm-ce-java11-linux-amd64-21.2.0.tar.gz tar xzf graalvm-ce-java11-linux-amd64-21.3.0.tar.gz
fi fi
- name: Babashka version - name: Babashka version
@ -217,14 +217,14 @@ jobs:
run: | run: |
export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar
export BABASHKA_XMX="-J-Xmx6g" export BABASHKA_XMX="-J-Xmx6g"
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
export BABASHKA_STATIC=true export BABASHKA_STATIC=true
script/compile script/compile
- name: Test binary - name: Test binary
run: | run: |
./bb '(+ 1 2 3)' ./bb '(+ 1 2 3)'
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
BABASHKA_TEST_ENV=native script/test BABASHKA_TEST_ENV=native script/test
- name: Install clojure - name: Install clojure
@ -233,7 +233,7 @@ jobs:
- name: Test libraries - name: Test libraries
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0"
BABASHKA_TEST_ENV=native script/run_lib_tests BABASHKA_TEST_ENV=native script/run_lib_tests
- name: Upload artifact - name: Upload artifact
@ -262,17 +262,17 @@ jobs:
uses: actions/cache@v1 uses: actions/cache@v1
id: cache-graalvm id: cache-graalvm
with: with:
path: ~/graalvm-ce-java11-21.2.0 path: ~/graalvm-ce-java11-21.3.0
key: ${{ runner.os }}-graalvm-21.2.0 key: ${{ runner.os }}-graalvm-21.3.0
restore-keys: | restore-keys: |
${{ runner.os }}-graalvm-21.2.0 ${{ runner.os }}-graalvm-21.3.0
- name: Download GraalVM - name: Download GraalVM
run: | run: |
cd ~ cd ~
if ! [ -d graalvm-ce-java11-21.2.0 ]; then if ! [ -d graalvm-ce-java11-21.3.0 ]; then
curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.2.0/graalvm-ce-java11-darwin-amd64-21.2.0.tar.gz curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-darwin-amd64-21.3.0.tar.gz
tar xzf graalvm-ce-java11-darwin-amd64-21.2.0.tar.gz tar xzf graalvm-ce-java11-darwin-amd64-21.3.0.tar.gz
fi fi
- name: Babashka version - name: Babashka version
@ -285,18 +285,18 @@ jobs:
run: | run: |
export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar
export BABASHKA_XMX="-J-Xmx6g" export BABASHKA_XMX="-J-Xmx6g"
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0/Contents/Home" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0/Contents/Home"
script/compile script/compile
- name: Test binary - name: Test binary
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0/Contents/Home" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0/Contents/Home"
sudo script/install-leiningen sudo script/install-leiningen
BABASHKA_TEST_ENV=native script/test BABASHKA_TEST_ENV=native script/test
- name: Test libraries - name: Test libraries
run: | run: |
export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.2.0/Contents/Home" export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0/Contents/Home"
sudo script/install-clojure sudo script/install-clojure
BABASHKA_TEST_ENV=native script/run_lib_tests BABASHKA_TEST_ENV=native script/run_lib_tests

2
Dockerfile
View file

@ -5,7 +5,7 @@ RUN apt update
RUN apt install --no-install-recommends -yy build-essential zlib1g-dev RUN apt install --no-install-recommends -yy build-essential zlib1g-dev
WORKDIR "/opt" WORKDIR "/opt"
ENV GRAALVM_VERSION="21.2.0" ENV GRAALVM_VERSION="21.3.0"
RUN curl -sLO https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAALVM_VERSION}/graalvm-ce-java11-linux-amd64-${GRAALVM_VERSION}.tar.gz RUN curl -sLO https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAALVM_VERSION}/graalvm-ce-java11-linux-amd64-${GRAALVM_VERSION}.tar.gz
RUN tar -xzf graalvm-ce-java11-linux-amd64-${GRAALVM_VERSION}.tar.gz RUN tar -xzf graalvm-ce-java11-linux-amd64-${GRAALVM_VERSION}.tar.gz

6
appveyor.yml
View file

@ -7,8 +7,8 @@ image: Visual Studio 2017
clone_folder: C:\projects\babashka clone_folder: C:\projects\babashka
environment: environment:
GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.2.0 GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.3.0
JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.2.0 JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.3.0
BABASHKA_XMX: "-J-Xmx5g" BABASHKA_XMX: "-J-Xmx5g"
cache: cache:
@ -33,7 +33,7 @@ clone_script:
build_script: build_script:
- cmd: >- - cmd: >-
powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.2.0/graalvm-ce-java11-windows-amd64-21.2.0.zip', 'graalvm.zip') }" powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-windows-amd64-21.3.0.zip', 'graalvm.zip') }"
powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }" powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }"

8
doc/build.md
View file

@ -3,24 +3,24 @@
## Prerequisites ## Prerequisites
- Install [lein](https://leiningen.org/) for producing uberjars - Install [lein](https://leiningen.org/) for producing uberjars
- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *java11-21.2.0*. - Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *java11-21.3.0*.
- For Windows, installing Visual Studio 2019 with the "Desktop development - For Windows, installing Visual Studio 2019 with the "Desktop development
with C++" workload is recommended. with C++" workload is recommended.
- Set `$GRAALVM_HOME` to the GraalVM distribution directory. On macOS this can look like: - Set `$GRAALVM_HOME` to the GraalVM distribution directory. On macOS this can look like:
``` shell ``` shell
export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-21.2.0/Contents/Home export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-21.3.0/Contents/Home
``` ```
On linux: On linux:
``` shell ``` shell
export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-21.2.0 export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-21.3.0
``` ```
On Windows, from the [Visual Studio 2019 x64 Native Tools Command Prompt](https://github.com/oracle/graal/issues/2116#issuecomment-590470806) or `cmd.exe` (not Powershell): On Windows, from the [Visual Studio 2019 x64 Native Tools Command Prompt](https://github.com/oracle/graal/issues/2116#issuecomment-590470806) or `cmd.exe` (not Powershell):
``` ```
set GRAALVM_HOME=%USERPROFILE%\Downloads\graalvm-ce-java11-21.2.0 set GRAALVM_HOME=%USERPROFILE%\Downloads\graalvm-ce-java11-21.3.0
``` ```
If you are not running from the x64 Native Tools Command Prompt, you will need to set additional environment variables using: If you are not running from the x64 Native Tools Command Prompt, you will need to set additional environment variables using:
``` ```

2
doc/dev.md
View file

@ -1,6 +1,6 @@
# Developing Babashka # Developing Babashka
You need [lein](https://leiningen.org/) for running JVM tests and/or producing uberjars. For building binaries you need GraalVM. Currently we use java11-21.2.0. You need [lein](https://leiningen.org/) for running JVM tests and/or producing uberjars. For building binaries you need GraalVM. Currently we use java11-21.3.0.
## Clone repository ## Clone repository

4
script/bump_graal_version.clj
View file

@ -51,9 +51,9 @@
;; OR ;; OR
;; ;;
;; We could have them as environment variables ;; We could have them as environment variables
(def current-graal-version "21.1.0") (def current-graal-version "21.2.0")
(def current-java-version "java11") (def current-java-version "java11")
(def valid-graal-bumps ["19.3.2" "20.1.0" "20.2.0" "20.3.0" "21.0.0" "21.1.0" "21.2.0"]) (def valid-graal-bumps ["19.3.2" "20.1.0" "20.2.0" "20.3.0" "21.0.0" "21.1.0" "21.2.0" "21.3.0"])
(def valid-java-bumps ["java8" "java11"]) (def valid-java-bumps ["java8" "java11"])
(def cl-options (def cl-options