ci/native-builds-macos-linux (#737)

* ci: macos 14

* fixup! ci: macos 14

* fixup! ci: macos 14

Author: TimoKramer

.circleci/config.yml

@@ -195,6 +195,9 @@ workflows:
           context:
             - dockerhub-deploy
             - github-token
+          filters:
+            branches:
+              only: main
           requires:
             - setup
       - format:

.circleci/scripts/gen_ci.clj

@@ -5,7 +5,7 @@
    [clojure.string :as str]
    [flatland.ordered.map :refer [ordered-map]]))
 
-(def graalvm-version "22.0.2")
+(def graalvm-version "24.0.1")
 
 (defn run
   ([cmd-name cmd]

.cirrus.yml

@@ -2,14 +2,17 @@ macos_instance:
   image: ghcr.io/cirruslabs/macos-monterey-base:latest
 
 build-task:
+  only_if: $CIRRUS_BRANCH == 'main'
+  maven_cache:
+    folder: ~/.m2
   env:
     DTHK_PLATFORM: macos
     DTHK_ARCH: aarch64
     INSTALL_DIR: ${HOME}
     GRAALVM_VERSION: 22.0.2
     GRAALVM_SLUG: 9.1
     GRAALVM_HOME: ${HOME}/graalvm-community-openjdk-${GRAALVM_VERSION}+${GRAALVM_SLUG}/Contents/Home/
-    GITHUB_TOKEN: ENCRYPTED[0ea782cbbd99c2486b0f55b8eefcf91606a0805faaa3f35e55ecb75268b0046b874c856753f528ba689a9cdaa11e47c2]
+    GITHUB_TOKEN: ENCRYPTED[!86a3791406be6ffc9490f464846ec5385908ae8d3d2a9eeb1457d529060816e14e9d7b88ecd190970add6a5d5d4e7b59!]
   script: |
     set -euo pipefail
 
@@ -44,13 +47,11 @@ build-task:
     bb ni-cli
 
     # test
-    file dthk
     bb test native-image
     bb test bb-pod
 
     # upload artifact
-    if [[ $CIRRUS_RELEASE == "" ]]; then
-      bb release native-cli
-    fi
+    bb release native-image
+
   binaries_artifacts:
     path: "dist/*"

.github/workflows/native-image.yml

@@ -7,7 +7,6 @@ on:
     paths-ignore:
       - '**/README.md'
       - 'doc/**'
-      - '.github/**'
       - '.circleci/**'
       - 'bb/**'
       - 'dev/**'
@@ -20,42 +19,40 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-12
+          - os: macos-13
             name: macos
     runs-on: ${{ matrix.os }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      GRAALVM_VERSION: 22.0.2
+      GRAALVM_VERSION: 24.0.1
       DTHK_PLATFORM: macos
       DTHK_ARCH: amd64
     steps:
       - name: Git checkout
         uses: actions/checkout@v2
         with:
-          fetch-depth: 1
+          fetch-depth: 0
           submodules: 'true'
 
-      - name: Cache deps
-        uses: actions/cache@v2
-        id: cache-deps
+      - name: Restore cache
+        uses: actions/cache/restore@v4
+        id: restore-cache
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('project.clj') }}
-          restore-keys: ${{ runner.os }}-maven-
+          key: ${{ runner.os }}-maven-${{ hashFiles('deps.edn') }}
 
       - name: Setup GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '22'
+          java-version: '24'
           distribution: 'graalvm'
-          components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install clojure tools
         uses: DeLaGuardo/setup-clojure@5.0
         with:
-          cli: 1.10.3.1040
-          bb: 1.3.191
+          cli: 1.12.1.1550
+          bb: 1.12.204
 
       - name: Build native image
         run: bb ni-cli
@@ -66,4 +63,11 @@ jobs:
           bb test bb-pod
 
       - name: Release native-image
-        run: bb release native-cli
+        run: bb release native-image
+
+      - name: Save cache
+        uses: actions/cache/save@v4
+        id: save-cache
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('deps.edn') }}

config.edn

@@ -9,17 +9,15 @@
        :developerConnection "scm:git:git@github.com:replikativ/datahike.git"
        :url "https://github.com/replikativ/datahike"}
 
- :build {:clj {;; jvm build
-               :src-dirs ["src"]
+ :build {:clj {:src-dirs ["src"]
                :resource-dir "resources"
                :java-src-dirs ["java"]
                :target-dir "target"
                :class-dir "target/classes"
                :deps-file "deps.edn"
                :jar-pattern "{{repo.lib}}-{{version-str}}.jar"
                :lib io.replikativ/datahike}
-         :http-server-clj {;; jvm build
-                           :src-dirs      ["src" "http-server" "resources"]
+         :http-server-clj {:src-dirs      ["src" "http-server" "resources"]
                            :java-src-dirs ["java"]
                            :target-dir    "target-http-server"
                            :class-dir     "target-http-server/classes"
@@ -28,8 +26,7 @@
                            :aliases       [:http-server]
                            :main          datahike.http.server
                            :lib           io.replikativ/datahike-http-server}
-         :native {;; jvm build
-                  :src-dirs ["src" "libdatahike/src"]
+         :native {:src-dirs ["src" "libdatahike/src"]
                   :java-src-dirs ["java"]
                   :resource-dir "resources"
                   :target-dir "target"