From d7c80012b1d1d85548f0ba2cdf982d7394d5ac03 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 28 Feb 2025 11:02:39 +0100 Subject: [PATCH 01/18] v2024.02.28 --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 446f42cb..f8f7a636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,15 +7,14 @@ A preview of the next release can be installed from [Babashka](https://github.com/babashka/babashka): Native, fast starting Clojure interpreter for scripting -## Unreleased +## 1.12.197 (2024-02-28) - [#1785](https://github.com/babashka/babashka/issues/1785): Allow subclasses of `Throwable` to have instance methods invoked ([@bobisageek](https://github.com/bobisageek)) - [#1791](https://github.com/babashka/babashka/issues/1791): interop problem on Jsoup form element -- #1793: Bump `rewrite-clj` to `1.1.49` +- [#1793](https://github.com/babashka/babashka/issues/1793): Bump `rewrite-clj` to `1.1.49` (fixes parsing of `foo//` among other things) - Bump `deps.clj` - Bump `fs` - ## 1.12.196 (2024-12-24) - [#1771](https://github.com/babashka/babashka/issues/1771): `*e*` in REPL should contain exception thrown by user, not a wrapped one From 63a51ff6693848ba09484f6a74a595d11769ab64 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 28 Feb 2025 11:13:20 +0100 Subject: [PATCH 02/18] v1.12.197 --- resources/BABASHKA_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION index a6f794c1..5055a5a6 100644 --- a/resources/BABASHKA_VERSION +++ b/resources/BABASHKA_VERSION @@ -1 +1 @@ -1.12.197-SNAPSHOT \ No newline at end of file +1.12.197 \ No newline at end of file From 6f43c47f2a38dcbf44d217dd45034753bc5e0314 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 28 Feb 2025 12:23:15 +0100 Subject: [PATCH 03/18] Version bump --- resources/BABASHKA_RELEASED_VERSION | 2 +- resources/BABASHKA_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/BABASHKA_RELEASED_VERSION b/resources/BABASHKA_RELEASED_VERSION index 69353e92..5055a5a6 100644 --- a/resources/BABASHKA_RELEASED_VERSION +++ b/resources/BABASHKA_RELEASED_VERSION @@ -1 +1 @@ -1.12.196 \ No newline at end of file +1.12.197 \ No newline at end of file diff --git a/resources/BABASHKA_VERSION b/resources/BABASHKA_VERSION index 5055a5a6..fcba5798 100644 --- a/resources/BABASHKA_VERSION +++ b/resources/BABASHKA_VERSION @@ -1 +1 @@ -1.12.197 \ No newline at end of file +1.12.198-SNAPSHOT \ No newline at end of file From cdcf9deb1c3e7814e437991f7955a450ab8d197a Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 28 Feb 2025 14:22:23 +0100 Subject: [PATCH 04/18] Bump deps.clj --- deps.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.clj b/deps.clj index a6e46611..22e0987f 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit a6e46611e137892458623d54f6460975c9b3ce63 +Subproject commit 22e0987fd4252112d4abf1be3d19c29b8d78972f From d053a3c0c5567775c85e9d23d6da84548dc408dd Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 4 Mar 2025 10:00:38 +0100 Subject: [PATCH 05/18] Bump deps.clj --- deps.clj | 2 +- deps.edn | 2 +- project.clj | 2 +- resources/META-INF/babashka/deps.edn | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.clj b/deps.clj index 22e0987f..65f5898d 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit 22e0987fd4252112d4abf1be3d19c29b8d78972f +Subproject commit 65f5898d790c2388bfb0b6b98be44259718cd994 diff --git a/deps.edn b/deps.edn index 7420e333..0eef4fa0 100644 --- a/deps.edn +++ b/deps.edn @@ -52,7 +52,7 @@ org.babashka/cli {:mvn/version "0.8.62"} org.babashka/http-client {:mvn/version "0.4.22"} org.flatland/ordered {:mvn/version "1.15.12"} - org.jsoup/jsoup {:mvn/version "1.18.1"}} + org.jsoup/jsoup {:mvn/version "1.19.1"}} :aliases {:babashka/dev {:main-opts ["-m" "babashka.main"]} :profile diff --git a/project.clj b/project.clj index a3b0ddc8..d476bc99 100644 --- a/project.clj +++ b/project.clj @@ -36,7 +36,7 @@ [insn/insn "0.5.2"] [org.babashka/cli "0.8.62"] [org.babashka/http-client "0.4.22"] - [org.jsoup/jsoup "1.18.1"] + [org.jsoup/jsoup "1.19.1"] [borkdude/graal.locking "0.0.2"]] :plugins [[org.kipz/lein-meta-bom "0.1.1"]] :metabom {:jar-name "metabom.jar"} diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index 7420e333..0eef4fa0 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -52,7 +52,7 @@ org.babashka/cli {:mvn/version "0.8.62"} org.babashka/http-client {:mvn/version "0.4.22"} org.flatland/ordered {:mvn/version "1.15.12"} - org.jsoup/jsoup {:mvn/version "1.18.1"}} + org.jsoup/jsoup {:mvn/version "1.19.1"}} :aliases {:babashka/dev {:main-opts ["-m" "babashka.main"]} :profile From f9935def7e01ef04450f29fdafefd72ade808aea Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 6 Mar 2025 17:10:34 +0100 Subject: [PATCH 06/18] Bump deps.clj --- deps.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.clj b/deps.clj index 22e0987f..976cf7b0 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit 22e0987fd4252112d4abf1be3d19c29b8d78972f +Subproject commit 976cf7b0e54901ada3f7e83f12a4c0aed039adc9 From 9ed0507030548967420de52445a0c44d09831253 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 6 Mar 2025 17:12:58 +0100 Subject: [PATCH 07/18] fix cache --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 315363f0..72645d08 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: submodules: 'true' - name: Cache deps - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache-deps with: path: ~/.m2/repository @@ -117,7 +117,7 @@ jobs: submodules: 'true' - name: Cache deps - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache-deps with: path: ~/.m2/repository From a45f76b029e921e596d0c75666d7d457537c3941 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Mon, 10 Mar 2025 20:54:49 +0100 Subject: [PATCH 08/18] deps.clj --- deps.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.clj b/deps.clj index 65f5898d..976cf7b0 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit 65f5898d790c2388bfb0b6b98be44259718cd994 +Subproject commit 976cf7b0e54901ada3f7e83f12a4c0aed039adc9 From 50fc2e2582d81f7122f02d277b9779fd48fc6c21 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Mon, 10 Mar 2025 21:02:02 +0100 Subject: [PATCH 09/18] Upgrade jsoup --- deps.edn | 2 +- resources/META-INF/babashka/deps.edn | 2 +- test-resources/lib_tests/bb-tested-libs.edn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.edn b/deps.edn index 0eef4fa0..5cac0a0b 100644 --- a/deps.edn +++ b/deps.edn @@ -174,7 +174,7 @@ prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing", :git/sha "424bc704f2db422de34269c139a5494314b3a43b"} org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" - :git/sha "27ee318928b6748075fa9954740afedf916ff795"}} + :git/sha "749ba998aa64f19092876cda967e6c562c56b81d"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index 0eef4fa0..5cac0a0b 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -174,7 +174,7 @@ prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing", :git/sha "424bc704f2db422de34269c139a5494314b3a43b"} org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" - :git/sha "27ee318928b6748075fa9954740afedf916ff795"}} + :git/sha "749ba998aa64f19092876cda967e6c562c56b81d"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index 10820bb3..abd1dc99 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -193,7 +193,7 @@ :test-namespaces [plumbing.core-test], :test-paths ["test"]} org.clj-commons/hickory {:git-url "https://github.com/clj-commons/hickory" - :git-sha "27ee318928b6748075fa9954740afedf916ff795" + :git-sha "749ba998aa64f19092876cda967e6c562c56b81d" :test-paths ["test/cljc"] :test-namespaces [hickory.test.core hickory.test.convert From 6d5fc67467c841622c6644ad7748c80d02b5c6cf Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 11 Mar 2025 11:21:13 +0100 Subject: [PATCH 10/18] Bump to main branch --- deps.edn | 2 +- test-resources/lib_tests/bb-tested-libs.edn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index 5cac0a0b..7f036267 100644 --- a/deps.edn +++ b/deps.edn @@ -174,7 +174,7 @@ prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing", :git/sha "424bc704f2db422de34269c139a5494314b3a43b"} org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" - :git/sha "749ba998aa64f19092876cda967e6c562c56b81d"}} + :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index abd1dc99..00a68e87 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -193,7 +193,7 @@ :test-namespaces [plumbing.core-test], :test-paths ["test"]} org.clj-commons/hickory {:git-url "https://github.com/clj-commons/hickory" - :git-sha "749ba998aa64f19092876cda967e6c562c56b81d" + :git-sha "9385b6708ef35f161732d8464b3a3aa57dd79f30" :test-paths ["test/cljc"] :test-namespaces [hickory.test.core hickory.test.convert From 4c6fe98236aa63e0044a7caff772510e441c2af0 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 11 Mar 2025 15:07:16 +0100 Subject: [PATCH 11/18] Bump deps --- CHANGELOG.md | 5 +++++ project.clj | 2 +- sci | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8f7a636..cd852a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ A preview of the next release can be installed from [Babashka](https://github.com/babashka/babashka): Native, fast starting Clojure interpreter for scripting +## Unreleased + +- Bump SCI to `0.9.45` +- Bump edamame to `1.4.28` + ## 1.12.197 (2024-02-28) - [#1785](https://github.com/babashka/babashka/issues/1785): Allow subclasses of `Throwable` to have instance methods invoked ([@bobisageek](https://github.com/bobisageek)) diff --git a/project.clj b/project.clj index d476bc99..14ee8dab 100644 --- a/project.clj +++ b/project.clj @@ -22,7 +22,7 @@ :flaky :flaky} :jvm-opts ["--enable-preview"] :dependencies [[org.clojure/clojure "1.12.0"] - [borkdude/edamame "1.4.27"] + [borkdude/edamame "1.4.28"] [org.clojure/tools.cli "1.0.214"] [cheshire "5.13.0"] [nrepl/bencode "1.2.0"] diff --git a/sci b/sci index 7bc5c4f1..58674754 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit 7bc5c4f1e35fb18a85005c47d7659213ff7f64e9 +Subproject commit 58674754c32a18f0d7dbd3de4e021b1dc54c4053 From f967e10bdd77e40660e8a033d7df62b2e0823949 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 17 Mar 2025 10:54:07 -0400 Subject: [PATCH 12/18] docs: readme: badges: reference bb book Give only a quick summary of bb badges in the README, and reference the new full description in bb book. Closes #1798 --- README.md | 57 +++++-------------------------------------------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index cc9da4c8..6a289fde 100644 --- a/README.md +++ b/README.md @@ -303,63 +303,16 @@ Go [here](https://book.babashka.org/#built-in-namespaces) to see the full list o A list of projects (scripts, libraries, pods and tools) known to work with babashka. ## Badges - - -[![bb compatible](/logo/badge.svg)](https://babashka.org) - -The babashka compatible badge indicates that a [library can be used as babashka dependency](doc/projects.md). +[![bb compatible](/logo/badge.svg)](https://book.babashka.org#badges) +The babashka compatible badge indicates that a library can be used as babashka dependency. If this is the case for your library, we encourage you to proudly display this badge. -
Markdown - -```markdown -[![bb compatible](https://raw.githubusercontent.com/babashka/babashka/master/logo/badge.svg)](https://babashka.org) -``` -
- -
AsciiDoc - -```asciidoc -https://babashka.org[image:https://raw.githubusercontent.com/babashka/babashka/master/logo/badge.svg[bb compatible]] -``` -
- -
HTML - -```html -bb compatible -``` -
-
- -[![bb built-in](/logo/built-in-badge.svg)](https://babashka.org) - -The babashka built-in badge means that a [library has been built directly into babashka](https://book.babashka.org/#built-in-namespaces) and requires no extra dependencies to use it. - +[![bb built-in](/logo/built-in-badge.svg)](https://book.babashka.org#badges) +The babashka built-in badge means that a library has been built directly into babashka and requires no extra dependencies to use it. If this rare honor belongs to your library, you should display this badge. -
Markdown - -```markdown -[![bb built-in](https://raw.githubusercontent.com/babashka/babashka/master/logo/built-in-badge.svg)](https://babashka.org) -``` -
- -
AsciiDoc - -```asciidoc -https://babashka.org[image:https://raw.githubusercontent.com/babashka/babashka/master/logo/built-in-badge.svg[bb built-in]] -``` -
- -
HTML - -```html -bb built-in -``` -
-
+See [the babashka book for details](https://book.babashka.org#badges). ## Swag From 4a2a305e382fe6facba41315000ab7fec681c589 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 19 Mar 2025 16:38:17 +0100 Subject: [PATCH 13/18] GraalVM 24 (#1800) --- .circleci/script/gen_ci.clj | 2 +- .cirrus.yml | 2 +- .github/workflows/build-windows.yml | 100 +++++++++++++++++++++++++++ .github/workflows/build.yml | 6 +- Dockerfile | 2 +- appveyor.yml | 6 +- doc/build.md | 2 +- doc/dev.md | 2 +- resources/META-INF/babashka/deps.edn | 2 +- script/bump_graal_version.clj | 3 +- script/install-graalvm | 2 +- 11 files changed, 114 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/build-windows.yml diff --git a/.circleci/script/gen_ci.clj b/.circleci/script/gen_ci.clj index ae0b9675..95da8d94 100644 --- a/.circleci/script/gen_ci.clj +++ b/.circleci/script/gen_ci.clj @@ -5,7 +5,7 @@ [clojure.string :as str] [flatland.ordered.map :refer [ordered-map]])) -(def graalvm-version "23") +(def graalvm-version "24") (defn run ([cmd-name cmd] diff --git a/.cirrus.yml b/.cirrus.yml index 3e36b348..7d55f85f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ task: skip: "changesIncludeOnly('logo/*', '**.md')" env: LEIN_ROOT: "true" - GRAALVM_VERSION: "23" + GRAALVM_VERSION: "24" GRAALVM_HOME: ${HOME}/graalvm-${GRAALVM_VERSION}/Contents/Home BABASHKA_PLATFORM: macos # used in release script BABASHKA_ARCH: aarch64 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml new file mode 100644 index 00000000..0a5d297f --- /dev/null +++ b/.github/workflows/build-windows.yml @@ -0,0 +1,100 @@ +name: build + +on: + push: + paths-ignore: + - "**.md" + - "logo/**" + pull_request: + paths-ignore: + - "**.md" + - "logo/**" + +# TODO: Add deploy if needed +jobs: + native: + if: "!contains(github.event.head_commit.message, 'skip ci')" + strategy: + matrix: + include: + - os: windows-2022 + name: windows + static: false + runs-on: ${{ matrix.os }} + env: + LEIN_ROOT: "true" + GRAALVM_VERSION: "24" + BABASHKA_PLATFORM: ${{ matrix.name }} # used in release script + BABASHKA_TEST_ENV: native + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BABASHKA_SHA: ${{ github.sha }} + steps: + - name: Git checkout + uses: actions/checkout@v2 + with: + fetch-depth: 1 + submodules: 'true' + + - name: Cache deps + uses: actions/cache@v4 + id: cache-deps + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('project.clj') }} + restore-keys: ${{ runner.os }}-maven- + + - name: Setup GraalVM + if: "matrix.static == false" + uses: graalvm/setup-graalvm@v1.3.3 + with: + java-version: '24' + distribution: 'graalvm' + components: 'native-image' + github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Install clojure tools + uses: DeLaGuardo/setup-clojure@13.2 + with: + cli: latest + # lein: latest -- skipped because this uses some PS bullshit + + - name: Babashka version + id: babashka-version + shell: bash + run: | + BABASHKA_VERSION=$(cat resources/BABASHKA_VERSION) + echo "##[set-output name=version;]${BABASHKA_VERSION}" + + - name: Build + shell: cmd + run: | + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein.bat', 'lein.bat')" + call lein self-install + + set GRAALVM_HOME=%JAVA_HOME% + call script/uberjar.bat + + call script/compile.bat + + echo Creating zip archive + + set zip=babashka-%BABASHKA_VERSION%-windows-amd64.zip + + jar -cMf %zip% bb.exe + + bb --config .build/bb.edn --deps-root . release-artifact %zip% + + + - name: Test binary and libs + shell: cmd + run: | + set BABASHKA_CLASSPATH= + set BABASHKA_TEST_ENV=native + call script/test.bat :windows + call script/run_lib_tests.bat + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + path: bb.exe + name: babashka-${{ steps.babashka-version.outputs.version }}-${{ matrix.name }}-amd64 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72645d08..b64257aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,7 +103,7 @@ jobs: runs-on: ${{ matrix.os }} env: LEIN_ROOT: "true" - GRAALVM_VERSION: "23" + GRAALVM_VERSION: "24" BABASHKA_PLATFORM: ${{ matrix.name }} # used in release script BABASHKA_TEST_ENV: native BABASHKA_XMX: "-J-Xmx6500m" @@ -128,7 +128,7 @@ jobs: if: "matrix.static == false" uses: graalvm/setup-graalvm@v1 with: - java-version: '23' + java-version: '24' distribution: 'graalvm' components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} @@ -137,7 +137,7 @@ jobs: if: "matrix.static == true" uses: graalvm/setup-graalvm@v1 with: - version: '23' + version: '24' distribution: 'graalvm' components: 'native-image' native-image-musl: true diff --git a/Dockerfile b/Dockerfile index 085b43e1..505a7f69 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="23" +ENV GRAALVM_VERSION="24" ARG TARGETARCH # Do not set those directly, use TARGETARCH instead ENV BABASHKA_ARCH= diff --git a/appveyor.yml b/appveyor.yml index 59c901ce..9ace75fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,8 +7,8 @@ image: Visual Studio 2022 clone_folder: C:\projects\babashka environment: - GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-23+37.1 - JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-23+37.1 + GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-24+36.1 + JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-24+36.1 BABASHKA_XMX: "-J-Xmx5g" skip_commits: @@ -44,7 +44,7 @@ clone_script: build_script: # TODO: Extract the zip by removing the top level folder to remove the hardcoded path for GRAALVM_HOME - cmd: >- - powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23_windows-x64_bin.zip', 'graalvm.zip') }" + powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24_windows-x64_bin.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 71df3425..c60507e5 100644 --- a/doc/build.md +++ b/doc/build.md @@ -3,7 +3,7 @@ ## Prerequisites - Install [lein](https://leiningen.org/) for producing uberjars -- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *Oracle GraalVM 23*. +- Download [GraalVM](https://www.graalvm.org/downloads/). Currently we use *Oracle GraalVM 24*. - 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: diff --git a/doc/dev.md b/doc/dev.md index b3a22bde..c9938027 100644 --- a/doc/dev.md +++ b/doc/dev.md @@ -40,7 +40,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 Oracle GraalVM 23. +You need [lein](https://leiningen.org/) for running JVM tests and/or producing uberjars. For building binaries you need GraalVM. Currently we use Oracle GraalVM 24. ## Clone repository diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index 5cac0a0b..7f036267 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -174,7 +174,7 @@ prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing", :git/sha "424bc704f2db422de34269c139a5494314b3a43b"} org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" - :git/sha "749ba998aa64f19092876cda967e6c562c56b81d"}} + :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/script/bump_graal_version.clj b/script/bump_graal_version.clj index e9a29fda..05643a7d 100755 --- a/script/bump_graal_version.clj +++ b/script/bump_graal_version.clj @@ -45,7 +45,6 @@ "appveyor.yml" "project.clj" "script/bump_graal_version.clj" - ".circleci/script/short_ci.clj" ".cirrus.yml" "script/install-graalvm"]) @@ -55,7 +54,7 @@ ;; OR ;; ;; We could have them as environment variables -(def current-graal-version "23") +(def current-graal-version "24") (def cl-options [["-g" "--graal VERSION" "graal version"] diff --git a/script/install-graalvm b/script/install-graalvm index 45add913..22d079e4 100755 --- a/script/install-graalvm +++ b/script/install-graalvm @@ -4,7 +4,7 @@ set -euo pipefail INSTALL_DIR="${1:-$HOME}" -GRAALVM_VERSION="${GRAALVM_VERSION:-23}" +GRAALVM_VERSION="${GRAALVM_VERSION:-24}" GRAALVM_PLATFORM=$BABASHKA_PLATFORM From 1b2682b67a314129a9cbfa4874d8d30554f1c564 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 19 Mar 2025 16:41:15 +0100 Subject: [PATCH 14/18] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd852a68..d3425b5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ A preview of the next release can be installed from ## Unreleased +- Bump GraalVM to `24` - Bump SCI to `0.9.45` - Bump edamame to `1.4.28` From 007209c0d2b0ce3200d5d81a8875063085f2482f Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 19 Mar 2025 17:23:26 +0100 Subject: [PATCH 15/18] debug windows --- test-resources/lib_tests/babashka/run_all_libtests.clj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test-resources/lib_tests/babashka/run_all_libtests.clj b/test-resources/lib_tests/babashka/run_all_libtests.clj index b9b70876..f5951cd2 100644 --- a/test-resources/lib_tests/babashka/run_all_libtests.clj +++ b/test-resources/lib_tests/babashka/run_all_libtests.clj @@ -75,6 +75,9 @@ (doseq [p test-paths] (add-classpath (str (fs/file git-dir p))))) (when-not (and skip-windows (windows?)) + (prn :branch (current-branch)) + (prn :head-ref (System/getenv "GITHUB_HEAD_REF")) + (prn (System/getenv)) (if (and flaky (#{"main" "master"} (current-branch))) (println "Skipping" tns "for main branch because it's marked flaky") (swap! test-nss into tns)))) From 597f180d32edcf4f87a357c88341c675892f7c9d Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 19 Mar 2025 17:40:33 +0100 Subject: [PATCH 16/18] remove debug --- test-resources/lib_tests/babashka/run_all_libtests.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/test-resources/lib_tests/babashka/run_all_libtests.clj b/test-resources/lib_tests/babashka/run_all_libtests.clj index f5951cd2..20e4e11b 100644 --- a/test-resources/lib_tests/babashka/run_all_libtests.clj +++ b/test-resources/lib_tests/babashka/run_all_libtests.clj @@ -76,7 +76,6 @@ (add-classpath (str (fs/file git-dir p))))) (when-not (and skip-windows (windows?)) (prn :branch (current-branch)) - (prn :head-ref (System/getenv "GITHUB_HEAD_REF")) (prn (System/getenv)) (if (and flaky (#{"main" "master"} (current-branch))) (println "Skipping" tns "for main branch because it's marked flaky") From a9060f00278c07f378a7ae963e122530ae69f851 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Mon, 31 Mar 2025 15:47:51 +0200 Subject: [PATCH 17/18] Bump process, fixes memory leak --- process | 2 +- sci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/process b/process index be97f9e8..2058c79f 160000 --- a/process +++ b/process @@ -1 +1 @@ -Subproject commit be97f9e84daa352e5adb84534ea5c8d2e666fe01 +Subproject commit 2058c79fb63f80ca71917432eddea73e0c58717c diff --git a/sci b/sci index 58674754..a5b71c75 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit 58674754c32a18f0d7dbd3de4e021b1dc54c4053 +Subproject commit a5b71c75de824100e2e1253ec7e09133ad2ff1dc From 08d60112edbff57f3a2415a5d3299f4934034045 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Mon, 31 Mar 2025 16:04:53 +0200 Subject: [PATCH 18/18] Bump edamame, throw on triple colon keyword --- project.clj | 2 +- sci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 14ee8dab..b88832d5 100644 --- a/project.clj +++ b/project.clj @@ -22,7 +22,7 @@ :flaky :flaky} :jvm-opts ["--enable-preview"] :dependencies [[org.clojure/clojure "1.12.0"] - [borkdude/edamame "1.4.28"] + [borkdude/edamame "1.4.29"] [org.clojure/tools.cli "1.0.214"] [cheshire "5.13.0"] [nrepl/bencode "1.2.0"] diff --git a/sci b/sci index a5b71c75..bb544b70 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit a5b71c75de824100e2e1253ec7e09133ad2ff1dc +Subproject commit bb544b70ecdf3574bb7600f9203b08041e9d50d0