From 5bece164f454f31d51a344b487cc5cd365d14a3c Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 19 Jun 2025 16:47:00 +1000 Subject: [PATCH 01/18] update blst to 0.3.15 --- blst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blst b/blst index e99f7db..6d960cd 160000 --- a/blst +++ b/blst @@ -1 +1 @@ -Subproject commit e99f7db0db413e2efefcfd077a4e335766f39c27 +Subproject commit 6d960cd05d6fe2b5bc9ba161edf0c1a131b87c4c From 3cb705ab31a6e024defe5993ab2a79084ad1bce1 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 19 Jun 2025 17:20:35 +1000 Subject: [PATCH 02/18] update brew --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 20d96ed..f18c1bc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ executors: working_directory: ~/jblst environment: GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2 - HOMEBREW_NO_AUTO_UPDATE: true + HOMEBREW_NO_AUTO_UPDATE: false commands: checkout_code: From ff933a803497ee03194593bcd1c641bb952549cd Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 19 Jun 2025 17:22:38 +1000 Subject: [PATCH 03/18] install libpng first to skip error --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f18c1bc..3d30aad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ executors: working_directory: ~/jblst environment: GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2 - HOMEBREW_NO_AUTO_UPDATE: false + HOMEBREW_NO_AUTO_UPDATE: true commands: checkout_code: @@ -117,6 +117,7 @@ jobs: - run: name: Install dependencies command: | + brew install libpng echo "Installing openjdk 11 for test execution" brew install openjdk@11 sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk From 77ae88f1b84621a62b095dd3d98fcc4612adbe26 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 19 Jun 2025 17:36:14 +1000 Subject: [PATCH 04/18] call brew update first --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d30aad..106ef3b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,7 +117,7 @@ jobs: - run: name: Install dependencies command: | - brew install libpng + brew update echo "Installing openjdk 11 for test execution" brew install openjdk@11 sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk From 5f05735f7f2ff1b0d7812174d6421b28b1a52802 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 10:44:40 +1000 Subject: [PATCH 05/18] upgrade xcode version --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 106ef3b..7d7c588 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ executors: GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2 mac_os_executor: macos: - xcode: "14.2.0" + xcode: "14.3.1" resource_class: macos.m1.medium.gen1 working_directory: ~/jblst environment: @@ -117,7 +117,6 @@ jobs: - run: name: Install dependencies command: | - brew update echo "Installing openjdk 11 for test execution" brew install openjdk@11 sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk From ec4221e4b9bf75b28a898903be677d180d3a34be Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 10:51:23 +1000 Subject: [PATCH 06/18] upgrade xcode version to latest will force us use openjdk 24.0.1 as jdk11 is deprecated --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d7c588..5a1d4aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ executors: GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2 mac_os_executor: macos: - xcode: "14.3.1" + xcode: "16.4.0" resource_class: macos.m1.medium.gen1 working_directory: ~/jblst environment: @@ -117,10 +117,7 @@ jobs: - run: name: Install dependencies command: | - echo "Installing openjdk 11 for test execution" - brew install openjdk@11 - sudo ln -sfn /usr/local/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk - + echo "Installing swig" brew install swig@4 brew install gnu-sed From 813feec0b6d02cabc0523f3675ecfed2a6935ee8 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 10:55:59 +1000 Subject: [PATCH 07/18] remove swig pinned at @4 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a1d4aa..5a79fed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,7 +119,7 @@ jobs: command: | echo "Installing swig" - brew install swig@4 + brew install swig brew install gnu-sed - run: From d836631f4c0a49898c1fe136cc3c6cc005b0fc0e Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 11:32:06 +1000 Subject: [PATCH 08/18] debug error --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a79fed..7507fe1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,7 +185,7 @@ jobs: cd blst\bindings\java ..\..\build.bat -D__BLST_PORTABLE__ if (-not $?) { - throw 'Build failed' + throw "Build failed Error: $($Error[0])" } sh .\run.me -D__BLST_PORTABLE__ if (-not $?) { From 777b98733553441f41de67db39260beaf823e9f5 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 12:35:49 +1000 Subject: [PATCH 09/18] use try catch --- .circleci/config.yml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7507fe1..168cbba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,15 +181,28 @@ jobs: - run: name: Generate windows shared lib command: | - $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" - cd blst\bindings\java - ..\..\build.bat -D__BLST_PORTABLE__ - if (-not $?) { - throw "Build failed Error: $($Error[0])" - } - sh .\run.me -D__BLST_PORTABLE__ - if (-not $?) { - throw 'Tests failed' + try { + # Update PATH environment variable + $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" + + # Change to the Java bindings directory + cd blst\bindings\java + + # Run the build script + ..\..\build.bat -D__BLST_PORTABLE__ + if (-not $?) { + throw "Build failed. Error: $($Error[0])" + } + + # Run the test script + sh .\run.me -D__BLST_PORTABLE__ + if (-not $?) { + throw "Tests failed. Error: $($Error[0])" + } + } catch { + # Catch any errors and output them + Write-Error "An error occurred: $_" + exit 1 } - persist_to_workspace: From 980a6fce43943f343139ab692385debe13141611 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 13:51:09 +1000 Subject: [PATCH 10/18] try verbose --- .circleci/config.yml | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 168cbba..7bc37cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,28 +181,16 @@ jobs: - run: name: Generate windows shared lib command: | - try { - # Update PATH environment variable - $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" - - # Change to the Java bindings directory - cd blst\bindings\java - - # Run the build script - ..\..\build.bat -D__BLST_PORTABLE__ - if (-not $?) { - throw "Build failed. Error: $($Error[0])" - } - - # Run the test script - sh .\run.me -D__BLST_PORTABLE__ - if (-not $?) { - throw "Tests failed. Error: $($Error[0])" - } - } catch { - # Catch any errors and output them - Write-Error "An error occurred: $_" - exit 1 + $ErrorActionPreference = 'SilentlyContinue' + $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" + cd blst\bindings\java + ..\..\build.bat -D__BLST_PORTABLE__ -Verbose + if (-not $?) { + throw 'Build failed Error: ' + } + sh .\run.me -D__BLST_PORTABLE__ + if (-not $?) { + throw 'Tests failed' } - persist_to_workspace: From 91b2b9252784da60b8964e3085e93d2eafaff0b2 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 14:03:22 +1000 Subject: [PATCH 11/18] 4.1.0 is no longer available so we should be good with 4.1.1 which is still in maven reoi --- .circleci/config.yml | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bc37cd..8295b7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,7 +184,7 @@ jobs: $ErrorActionPreference = 'SilentlyContinue' $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" cd blst\bindings\java - ..\..\build.bat -D__BLST_PORTABLE__ -Verbose + ..\..\build.bat -D__BLST_PORTABLE__ if (-not $?) { throw 'Build failed Error: ' } diff --git a/build.gradle b/build.gradle index e06a166..c90ae88 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'maven-publish' - id 'org.ajoberstar.grgit' version '4.1.0' + id 'org.ajoberstar.grgit' version '4.1.1' } rootProject.version = calculatePublishVersion() From bb1ee86d4faa74115715f4b0f14ff5aaa727f468 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 15:41:17 +1000 Subject: [PATCH 12/18] remove some leftover from the fight --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8295b7d..209d1e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -186,7 +186,7 @@ jobs: cd blst\bindings\java ..\..\build.bat -D__BLST_PORTABLE__ if (-not $?) { - throw 'Build failed Error: ' + throw 'Build failed' } sh .\run.me -D__BLST_PORTABLE__ if (-not $?) { From bb800a0cad2de06a6bd626799d22220f87ad12b3 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 15:41:50 +1000 Subject: [PATCH 13/18] remove some leftover from the fight --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 209d1e4..5a79fed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,7 +181,6 @@ jobs: - run: name: Generate windows shared lib command: | - $ErrorActionPreference = 'SilentlyContinue' $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" cd blst\bindings\java ..\..\build.bat -D__BLST_PORTABLE__ From d0c4ce3b54dd6aa42a8a5638c85504886afe9310 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 16:21:51 +1000 Subject: [PATCH 14/18] try this --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a79fed..515dc96 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,5 @@ --- -version: 2.1 +version: 2.2 orbs: win: circleci/windows@2.2.0 @@ -183,10 +183,7 @@ jobs: command: | $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" cd blst\bindings\java - ..\..\build.bat -D__BLST_PORTABLE__ - if (-not $?) { - throw 'Build failed' - } + ..\..\build.bat -shared sh .\run.me -D__BLST_PORTABLE__ if (-not $?) { throw 'Tests failed' From 95387bdb200ae9dccd5cd763e1e235db10eb40df Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 16:26:17 +1000 Subject: [PATCH 15/18] alright back to what it was in previous versions --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 515dc96..a46d44d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -183,7 +183,7 @@ jobs: command: | $Env:PATH = "$PWD\tdm\install\bin;$Env:PATH" cd blst\bindings\java - ..\..\build.bat -shared + ..\..\build.bat -D__BLST_PORTABLE__ sh .\run.me -D__BLST_PORTABLE__ if (-not $?) { throw 'Tests failed' From 208e933487d866e58d49a8b2b72901c63220a869 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 20 Jun 2025 16:27:58 +1000 Subject: [PATCH 16/18] opsie --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a46d44d..57828c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,5 @@ --- -version: 2.2 +version: 2.1 orbs: win: circleci/windows@2.2.0 From aa7bd86b17bf7ac9b8d5d4964c836b804363742f Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Wed, 29 Jul 2026 10:59:05 +1000 Subject: [PATCH 17/18] update to 0.3.17 and fix build dependency --- .circleci/config.yml | 8 ++++---- blst | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 57828c6..21b2146 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,11 +42,11 @@ commands: name: "Install Swig4" command: | sudo apt-get update - sudo apt-get install -y automake autoconf libpcre3 libpcre3-dev bison flex + sudo apt-get install -y automake autoconf libpcre2-dev pcre2-config bison flex echo "Installing swig" - curl -L -O https://github.com/swig/swig/archive/v4.0.2.tar.gz - tar -xzvf v4.0.2.tar.gz - cd swig-4.0.2/ + curl -L -O https://github.com/swig/swig/archive/v4.4.1.tar.gz + tar -xzvf v4.4.1.tar.gz + cd swig-4.4.1/ sh autogen.sh ./configure make diff --git a/blst b/blst index 6d960cd..54e6e55 160000 --- a/blst +++ b/blst @@ -1 +1 @@ -Subproject commit 6d960cd05d6fe2b5bc9ba161edf0c1a131b87c4c +Subproject commit 54e6e55674722fc2797ebb4bbb71b26d881eb4b8 From 6a62d6cca805e81b8cd8ed7ad3f9a162567f7a1a Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Wed, 29 Jul 2026 11:02:21 +1000 Subject: [PATCH 18/18] fix build dependency --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 21b2146..0ba4c25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ commands: name: "Install Swig4" command: | sudo apt-get update - sudo apt-get install -y automake autoconf libpcre2-dev pcre2-config bison flex + sudo apt-get install -y automake autoconf libpcre2-dev bison flex echo "Installing swig" curl -L -O https://github.com/swig/swig/archive/v4.4.1.tar.gz tar -xzvf v4.4.1.tar.gz