ci: fix macos releases (#750)

* fixup! ci: fix release libdatahike on macos

* revert this

* fixup! ci: fix release libdatahike on macos

* fixup! ci: fix release libdatahike on macos

* fixup! ci: fix release libdatahike on macos

* fixup! ci: fix release libdatahike on macos

* fixup! ci: fix release libdatahike on macos

* fixup! ci: fix release libdatahike on macos

* Revert "revert this"

This reverts commit 2331d57.

* fixup! ci: fix release libdatahike on macos

Author: TimoKramer

.circleci/config.yml

@@ -191,7 +191,8 @@ jobs:
       - run:
           name: Release pod on pod registry
           command: |
-            if ["$CIRCLE_ORGANIZATION_ID" = "replikativ"]; then
+            echo $CIRCLE_PROJECT_USERNAME
+            if [[ $CIRCLE_PROJECT_USERNAME == "replikativ" ]]; then
               bb release pod
             fi
 

.cirrus.yml

@@ -50,8 +50,7 @@ build-task:
     # test native artifacts
     bb test native-image
     bb test bb-pod
-    rm -rf "/tmp/libdatahike-test"
-    ./libdatahike/target/test_cpp "{:store {:backend :file :path \"/tmp/libdatahike-test\"} :schema-flexibility :read}" "[{:name \"Alice\"}]" "[:find ?e ?v :where [?e :name ?v]]"
+    bb test libdatahike
 
     # release native artifacts
     bb release native-image

.github/workflows/native-image.yml

@@ -47,6 +47,7 @@ jobs:
           java-version: '24'
           distribution: 'graalvm-community'
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          set-java-home: true
 
       - name: Install clojure tools
         uses: DeLaGuardo/setup-clojure@5.0
@@ -67,9 +68,7 @@ jobs:
         run:  bb test bb-pod
 
       - name: Test libdatahike
-        run: |
-          rm -rf "/tmp/libdatahike-test"
-          ./libdatahike/target/test_cpp "{:store {:backend :file :path \"/tmp/libdatahike-test\"} :schema-flexibility :read}" "[{:name \"Alice\"}]" "[:find ?e ?v :where [?e :name ?v]]"
+        run: bb test libdatahike
 
       - name: Release native-image
         run: bb release native-image

bb/resources/native-image-tests/run-libdatahike-tests

@@ -5,6 +5,8 @@ set -o pipefail
 set -o nounset
 
 export LD_LIBRARY_PATH=./libdatahike/target
+export DYLD_LIBRARY_PATH=./libdatahike/target
 
 rm -rf "/tmp/libdatahike-test"
+./libdatahike/compile-cpp
 ./libdatahike/target/test_cpp "{:store {:backend :file :path \"/tmp/libdatahike-test\"} :schema-flexibility :read}" "[{:name \"Alice\"}]" "[:find ?e ?v :where [?e :name ?v]]"

bb/src/tools/build.clj

@@ -6,8 +6,7 @@
     [cheshire.core :as json]
     [clojure.tools.build.api :as b]
     [selmer.parser :refer [render]]
-    [tools.version :as version :refer [read-edn-file]])
-  (:import [java.nio.file NoSuchFileException]))
+    [tools.version :as version :refer [read-edn-file]]))
 
 (defn clean [{:keys [target-dir] :as _project-config}]
   (print (str "Cleaning up target directory '" target-dir "'..."))

bb/src/tools/test.clj

@@ -51,8 +51,7 @@
 
 (defn libdatahike []
   (if (fs/exists? "./libdatahike/target")
-    (do (p/shell "./libdatahike/compile-cpp")
-        (p/shell "./bb/resources/native-image-tests/run-libdatahike-tests"))
+    (p/shell "./bb/resources/native-image-tests/run-libdatahike-tests")
     (println "libdatahike binaries missing. Please run 'bb ni-compile' and try again.")))
 
 (defn bb-pod []