From 136cd89efb9e499a47dc596f404e224969adf2aa Mon Sep 17 00:00:00 2001
From: Eric Coissac <eric@coissac.eu>
Date: Tue, 23 Jun 2026 14:59:35 +0200
Subject: [PATCH] ci: update macOS ARM64 build workflow and bump obikmer
 version

Replace manual Zig/cargo-zigbuild setup with a pre-configured Docker container (`joseluisq/rust-linux-darwin-builder`). Use explicit Clang cross-compilers for native macOS ARM64 compilation. Bump the `obikmer` package version to 1.1.25.
---
 .gitea/workflows/release.yml | 17 ++++++++---------
 src/Cargo.lock               |  2 +-
 src/obikmer/Cargo.toml       |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index e3951be..728d257 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -86,20 +86,17 @@ jobs:
   build-macos-arm64:
     needs: create-release
     runs-on: ubuntu-latest
+    container: joseluisq/rust-linux-darwin-builder:latest
     defaults:
       run:
         working-directory: src
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust + zigbuild
+      - name: Add target and install jq
         run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-          sudo apt-get update -qq && sudo apt-get install -y -qq jq
-          pip install ziglang --quiet --break-system-packages
-          $HOME/.cargo/bin/cargo install cargo-zigbuild
-          $HOME/.cargo/bin/rustup target add aarch64-apple-darwin
+          rustup target add aarch64-apple-darwin
+          apt-get update -qq && apt-get install -y -qq jq
 
       - name: Cache cargo registry
         uses: actions/cache@v4
@@ -113,8 +110,10 @@ jobs:
 
       - name: Build macOS binary
         env:
-          MACOSX_DEPLOYMENT_TARGET: "11.0"
-        run: cargo zigbuild --release --target aarch64-apple-darwin11.0 --no-default-features
+          CC: aarch64-apple-darwin22.4-clang
+          CXX: aarch64-apple-darwin22.4-clang++
+          CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER: aarch64-apple-darwin22.4-clang
+        run: cargo build --release --target aarch64-apple-darwin
 
       - name: Prepare and upload artifact
         env:
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 90123af..c55b87c 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1704,7 +1704,7 @@ dependencies = [
 
 [[package]]
 name = "obikmer"
-version = "1.1.24"
+version = "1.1.25"
 dependencies = [
  "clap",
  "csv",
diff --git a/src/obikmer/Cargo.toml b/src/obikmer/Cargo.toml
index 2954acf..de0bbed 100644
--- a/src/obikmer/Cargo.toml
+++ b/src/obikmer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "obikmer"
-version = "1.1.24"
+version = "1.1.25"
 edition = "2024"
 
 [[bin]]