From 854b6b277350b7c6ee55e34433089f2541717c73 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 14 May 2026 15:06:22 +0200
Subject: [PATCH] CI: use a custom Haiku VM image

---
 .github/workflows/ci.yml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 671f13238..9fee0e23e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -413,6 +413,8 @@ jobs:
             version: 'r1beta5'
             display_name: Haiku
             do_binaries: false
+            # custom image with all packages updated, python, rust
+            image_url: https://github.com/ThomasWaldmann/haiku-builder/releases/download/v0.1.4/haiku-r1beta5-x86-64.qcow2
 
     steps:
       - name: Check out repository
@@ -430,6 +432,7 @@ jobs:
           operating_system: ${{ matrix.os }}
           version: ${{ matrix.version }}
           shell: bash
+          image_url: ${{ matrix.image_url }}
           run: |
             set -euxo pipefail
 
@@ -557,16 +560,20 @@ jobs:
 
               haiku)
                 pkgman refresh
-                pkgman install -y git pkgconfig lz4
-                pkgman install -y openssl3
-                pkgman install -y rust_bin
-                pkgman install -y python3.10
-                pkgman install -y cffi
-                pkgman install -y lz4_devel openssl3_devel libffi_devel
+                # pkgman install -y git
+                pkgman install -y pkgconfig
+                pkgman install -y lz4 lz4_devel
+                # pkgman update -y openssl3 openssl3_devel
+                # pkgman install -y python3.10
+                # pkgman install -y rust_bin
+                # pkgman install -y setuptools_rust setuptools_rust_python310  # not sure whether this is needed
+                pkgman install -y cffi libffi_devel
+
+                cargo --version || true
 
                 # there is no pkgman package for tox, so we install it into a venv
                 python3 -m ensurepip --upgrade
-                python3 -m pip install --upgrade pip wheel
+                python3 -m pip install --upgrade pip setuptools wheel
                 python3 -m venv .venv
                 . .venv/bin/activate
 
@@ -574,6 +581,14 @@ jobs:
                 export BORG_LIBLZ4_PREFIX=/system/develop
                 export BORG_OPENSSL_PREFIX=/system/develop
                 pip install -r requirements.d/development.lock.txt
+                mkdir -p .cargo
+                echo "[build]" > .cargo/config.toml
+                echo "jobs = 1" >> .cargo/config.toml
+                echo "" >> .cargo/config.toml
+                echo "[profile.release]" >> .cargo/config.toml
+                echo "codegen-units = 1" >> .cargo/config.toml
+                pip install -v maturin
+                pip install -v blake3
                 pip install -e .
 
                 # troubles with either tox or pytest xdist, so we run pytest manually: