diff --git a/.circleci/config.yml b/.circleci/config.yml index 75ea81d5..aac22a89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,8 +72,8 @@ jobs: working_directory: ~/repo environment: LEIN_ROOT: "true" - GRAALVM_VERSION: "21.3.0" - GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0 + GRAALVM_VERSION: "22.0.0.2" + GRAALVM_HOME: /home/circleci/graalvm-ce-java11-22.0.0.2 BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native BABASHKA_XMX: "-J-Xmx6500m" @@ -123,7 +123,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-java11-21.3.0 + - ~/graalvm-ce-java11-22.0.0.2 key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -138,8 +138,8 @@ jobs: working_directory: ~/repo environment: LEIN_ROOT: "true" - GRAALVM_VERSION: "21.3.0" - GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0 + GRAALVM_VERSION: "22.0.0.2" + GRAALVM_HOME: /home/circleci/graalvm-ce-java11-22.0.0.2 BABASHKA_PLATFORM: linux # used in release script BABASHKA_TEST_ENV: native BABASHKA_STATIC: "true" @@ -202,7 +202,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-java11-21.3.0 + - ~/graalvm-ce-java11-22.0.0.2 key: linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -219,8 +219,8 @@ jobs: working_directory: ~/repo environment: LEIN_ROOT: "true" - GRAALVM_VERSION: "21.3.0" - GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0 + GRAALVM_VERSION: "22.0.0.2" + GRAALVM_HOME: /home/circleci/graalvm-ce-java11-22.0.0.2 BABASHKA_PLATFORM: linux # used in release script BABASHKA_ARCH: aarch64 BABASHKA_TEST_ENV: native @@ -270,7 +270,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-java11-21.3.0 + - ~/graalvm-ce-java11-22.0.0.2 key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -287,8 +287,8 @@ jobs: working_directory: ~/repo environment: LEIN_ROOT: "true" - GRAALVM_VERSION: "21.3.0" - GRAALVM_HOME: /home/circleci/graalvm-ce-java11-21.3.0 + GRAALVM_VERSION: "22.0.0.2" + GRAALVM_HOME: /home/circleci/graalvm-ce-java11-22.0.0.2 BABASHKA_PLATFORM: linux # used in release script BABASHKA_ARCH: aarch64 BABASHKA_TEST_ENV: native @@ -348,7 +348,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-java11-21.3.0 + - ~/graalvm-ce-java11-22.0.0.2 key: linux-aarch64-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release @@ -362,8 +362,8 @@ jobs: xcode: "12.0.0" environment: MACOSX_DEPLOYMENT_TARGET: 10.13 # 10.12 is EOL - GRAALVM_VERSION: "21.3.0" - GRAALVM_HOME: /Users/distiller/graalvm-ce-java11-21.3.0/Contents/Home + GRAALVM_VERSION: "22.0.0.2" + GRAALVM_HOME: /Users/distiller/graalvm-ce-java11-22.0.0.2/Contents/Home BABASHKA_PLATFORM: macos # used in release script BABASHKA_TEST_ENV: native BABASHKA_XMX: "-J-Xmx6500m" @@ -410,7 +410,7 @@ jobs: - save_cache: paths: - ~/.m2 - - ~/graalvm-ce-java11-21.3.0/Contents/Home + - ~/graalvm-ce-java11-22.0.0.2/Contents/Home key: mac-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }} - store_artifacts: path: /tmp/release diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48767194..57b20f95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,17 +45,17 @@ jobs: uses: actions/cache@v1 id: cache-graalvm with: - path: ~/graalvm-ce-java11-21.3.0 - key: ${{ runner.os }}-graalvm-21.3.0 + path: ~/graalvm-ce-java11-22.0.0.2 + key: ${{ runner.os }}-graalvm-22.0.0.2 restore-keys: | - ${{ runner.os }}-graalvm-21.3.0 + ${{ runner.os }}-graalvm-22.0.0.2 - name: Download GraalVM run: | cd ~ - if ! [ -d graalvm-ce-java11-21.3.0 ]; then - 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.3.0.tar.gz + if ! [ -d graalvm-ce-java11-22.0.0.2 ]; then + curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz + tar xzf graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz fi - name: Fetch deps @@ -65,18 +65,18 @@ jobs: - name: Run tests run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" script/test - name: Test libraries run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" sudo script/install-clojure script/run_lib_tests - name: Build uberjar run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" script/uberjar - name: Babashka version @@ -119,17 +119,17 @@ jobs: uses: actions/cache@v1 id: cache-graalvm with: - path: ~/graalvm-ce-java11-21.3.0 - key: ${{ runner.os }}-graalvm-21.3.0 + path: ~/graalvm-ce-java11-22.0.0.2 + key: ${{ runner.os }}-graalvm-22.0.0.2 restore-keys: | - ${{ runner.os }}-graalvm-21.3.0 + ${{ runner.os }}-graalvm-22.0.0.2 - name: Download GraalVM run: | cd ~ - if ! [ -d graalvm-ce-java11-21.3.0 ]; then - 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.3.0.tar.gz + if ! [ -d graalvm-ce-java11-22.0.0.2 ]; then + curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz + tar xzf graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz fi - name: Babashka version @@ -142,12 +142,12 @@ jobs: run: | export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar export BABASHKA_XMX="-J-Xmx6g" - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" script/compile - name: Test binary run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" BABASHKA_TEST_ENV=native script/test - name: Install clojure @@ -156,7 +156,7 @@ jobs: - name: Test libraries run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" BABASHKA_TEST_ENV=native script/run_lib_tests - name: Upload artifact @@ -194,17 +194,17 @@ jobs: uses: actions/cache@v1 id: cache-graalvm with: - path: ~/graalvm-ce-java11-21.3.0 - key: ${{ runner.os }}-graalvm-21.3.0 + path: ~/graalvm-ce-java11-22.0.0.2 + key: ${{ runner.os }}-graalvm-22.0.0.2 restore-keys: | - ${{ runner.os }}-graalvm-21.3.0 + ${{ runner.os }}-graalvm-22.0.0.2 - name: Download GraalVM run: | cd ~ - if ! [ -d graalvm-ce-java11-21.3.0 ]; then - 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.3.0.tar.gz + if ! [ -d graalvm-ce-java11-22.0.0.2 ]; then + curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz + tar xzf graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz fi - name: Babashka version @@ -217,14 +217,14 @@ jobs: run: | export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar export BABASHKA_XMX="-J-Xmx6g" - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" export BABASHKA_STATIC=true script/compile - name: Test binary run: | ./bb '(+ 1 2 3)' - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" BABASHKA_TEST_ENV=native script/test - name: Install clojure @@ -233,7 +233,7 @@ jobs: - name: Test libraries run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2" BABASHKA_TEST_ENV=native script/run_lib_tests - name: Upload artifact @@ -262,17 +262,17 @@ jobs: uses: actions/cache@v1 id: cache-graalvm with: - path: ~/graalvm-ce-java11-21.3.0 - key: ${{ runner.os }}-graalvm-21.3.0 + path: ~/graalvm-ce-java11-22.0.0.2 + key: ${{ runner.os }}-graalvm-22.0.0.2 restore-keys: | - ${{ runner.os }}-graalvm-21.3.0 + ${{ runner.os }}-graalvm-22.0.0.2 - name: Download GraalVM run: | cd ~ - if ! [ -d graalvm-ce-java11-21.3.0 ]; then - 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.3.0.tar.gz + if ! [ -d graalvm-ce-java11-22.0.0.2 ]; then + curl -O -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-darwin-amd64-22.0.0.2.tar.gz + tar xzf graalvm-ce-java11-darwin-amd64-22.0.0.2.tar.gz fi - name: Babashka version @@ -285,18 +285,18 @@ jobs: run: | export BABASHKA_JAR=babashka-${{ steps.babashka-version.outputs.version }}-standalone.jar export BABASHKA_XMX="-J-Xmx6g" - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0/Contents/Home" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2/Contents/Home" script/compile - name: Test binary run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0/Contents/Home" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2/Contents/Home" sudo script/install-leiningen BABASHKA_TEST_ENV=native script/test - name: Test libraries run: | - export GRAALVM_HOME="$HOME/graalvm-ce-java11-21.3.0/Contents/Home" + export GRAALVM_HOME="$HOME/graalvm-ce-java11-22.0.0.2/Contents/Home" sudo script/install-clojure BABASHKA_TEST_ENV=native script/run_lib_tests diff --git a/Dockerfile b/Dockerfile index 53f7f97e..8ffb784f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apt update RUN apt install --no-install-recommends -yy build-essential zlib1g-dev WORKDIR "/opt" -ENV GRAALVM_VERSION="21.3.0" +ENV GRAALVM_VERSION="22.0.0.2" ARG TARGETARCH ENV BABASHKA_ARCH=${TARGETARCH} ENV GRAALVM_ARCH=${TARGETARCH} diff --git a/appveyor.yml b/appveyor.yml index 23665955..b9e771c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,8 +7,8 @@ image: Visual Studio 2017 clone_folder: C:\projects\babashka environment: - GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.3.0 - JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.3.0 + GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-22.0.0.2 + JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-22.0.0.2 BABASHKA_XMX: "-J-Xmx5g" cache: @@ -33,7 +33,7 @@ clone_script: build_script: - 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.3.0/graalvm-ce-java11-windows-amd64-21.3.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-22.0.0.2/graalvm-ce-java11-windows-amd64-22.0.0.2.zip', 'graalvm.zip') }" powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }" diff --git a/doc/build.md b/doc/build.md index a5f83235..62f0ed43 100644 --- a/doc/build.md +++ b/doc/build.md @@ -3,24 +3,24 @@ ## Prerequisites - Install [lein](https://leiningen.org/) for producing uberjars -- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *java11-21.3.0*. +- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *java11-22.0.0.2*. - For Windows, installing Visual Studio 2019 with the "Desktop development with C++" workload is recommended. - Set `$GRAALVM_HOME` to the GraalVM distribution directory. On macOS this can look like: ``` shell - export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-21.3.0/Contents/Home + export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-22.0.0.2/Contents/Home ``` On linux: ``` shell - export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-21.3.0 + export GRAALVM_HOME=~/Downloads/graalvm-ce-java11-22.0.0.2 ``` 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.3.0 + set GRAALVM_HOME=%USERPROFILE%\Downloads\graalvm-ce-java11-22.0.0.2 ``` If you are not running from the x64 Native Tools Command Prompt, you will need to set additional environment variables using: ``` diff --git a/doc/dev.md b/doc/dev.md index 57fb9774..855510a5 100644 --- a/doc/dev.md +++ b/doc/dev.md @@ -37,7 +37,7 @@ reasons: ## Requirements -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. +You need [lein](https://leiningen.org/) for running JVM tests and/or producing uberjars. For building binaries you need GraalVM. Currently we use java11-22.0.0.2. ## Clone repository diff --git a/script/bump_graal_version.clj b/script/bump_graal_version.clj index 0e0a6865..29fa58f6 100755 --- a/script/bump_graal_version.clj +++ b/script/bump_graal_version.clj @@ -51,9 +51,9 @@ ;; OR ;; ;; We could have them as environment variables -(def current-graal-version "21.2.0") +(def current-graal-version "21.3.0") (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" "21.3.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" "22.0.0.2"]) (def valid-java-bumps ["java8" "java11"]) (def cl-options