From e3dad320297043e14a26737d53b7639e95ca260f Mon Sep 17 00:00:00 2001
From: Jeremie Fraeys <jfaeys@gmail.com>
Date: Thu, 5 Mar 2026 13:12:45 -0500
Subject: [PATCH] ci: consolidate CLI build workflow and add static rsync

- Add musl-tools to build-cli.yml for static linking support
- Move rsync build from ci.yml into build-cli.yml workflow
- Fix SQLite year parameter in both workflows
- Remove redundant RSYNC_VERSION env var from ci.yml

This consolidates the CLI artifact build process into a single
workflow file, making the CI pipeline easier to maintain.
---
 .forgejo/workflows/build-cli.yml | 14 ++++++++++++--
 .forgejo/workflows/ci.yml        |  7 +------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/build-cli.yml b/.forgejo/workflows/build-cli.yml
index 0c56441..646141f 100644
--- a/.forgejo/workflows/build-cli.yml
+++ b/.forgejo/workflows/build-cli.yml
@@ -33,10 +33,20 @@ jobs:
         with:
           version: 0.15.2
 
+      - name: Install musl-tools (for static rsync build)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y musl-tools
+
       - name: Fetch SQLite Amalgamation
         run: |
           cd cli
-          make build-sqlite SQLITE_VERSION=3480000
+          make build-sqlite SQLITE_VERSION=3480000 SQLITE_YEAR=2025
+
+      - name: Build static rsync
+        run: |
+          cd cli
+          make build-rsync RSYNC_VERSION=3.3.0
 
       - name: Build Release Binary
         run: |
@@ -66,7 +76,7 @@ jobs:
       - name: Fetch SQLite Amalgamation
         run: |
           cd cli
-          make build-sqlite SQLITE_VERSION=3480000
+          make build-sqlite SQLITE_VERSION=3480000 SQLITE_YEAR=2025
 
       - name: Build Release Binary
         run: |
diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index 96b6794..cea850f 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -30,7 +30,6 @@ permissions:
 env:
   GO_VERSION: '1.25.0'
   ZIG_VERSION: '0.15.2'
-  RSYNC_VERSION: '3.3.0'
 
 jobs:
   test:
@@ -95,11 +94,7 @@ jobs:
       run: |
         go mod download
         sudo apt-get update
-        sudo apt-get install -y podman redis-tools build-essential autoconf automake libtool pkg-config musl-tools
-
-    - name: Build pinned rsync from official source (for CLI tests)
-      run: |
-        make -C cli build-rsync RSYNC_VERSION=${{ env.RSYNC_VERSION }}
+        sudo apt-get install -y podman redis-tools build-essential autoconf automake libtool pkg-config
 
     - name: Verify dependencies
       run: go mod verify