From 12d877114281bda760c2dc956889634c90cff858 Mon Sep 17 00:00:00 2001
From: cloud <codetips@gmail.com>
Date: Wed, 1 Apr 2026 00:46:48 +0800
Subject: [PATCH] edit build-macos error

edit build-macos error
---
 .github/workflows/build-macos-m4.yml | 36 ++++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-macos-m4.yml b/.github/workflows/build-macos-m4.yml
index 5d96432a..b4621e06 100644
--- a/.github/workflows/build-macos-m4.yml
+++ b/.github/workflows/build-macos-m4.yml
@@ -3,11 +3,11 @@ name: Build Vaultwarden for macOS M4 (ARM64)
 on:
   push:
     branches: [ main ]
-  workflow_dispatch: # 允许手动触发
+  workflow_dispatch:
 
 jobs:
   build:
-    runs-on: macos-latest # 使用 GitHub 提供的 Apple Silicon 运行器
+    runs-on: macos-latest
     
     steps:
       - name: Checkout code
@@ -20,30 +20,40 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install openssl pkg-config
-          # 设置 OpenSSL 环境变量，这是编译 Rust 网络应用的关键
-          echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl)" >> $GITHUB_ENV
-          echo "OPENSSL_LIB_DIR=$(brew --prefix openssl)/lib" >> $GITHUB_ENV
-          echo "OPENSSL_INCLUDE_DIR=$(brew --prefix openssl)/include" >> $GITHUB_ENV
+          # 安装编译所需的依赖
+          brew install openssl mysql-client pkg-config
+          
+          # 获取 brew 安装路径的动态变量
+          MYSQL_PATH=$(brew --prefix mysql-client)
+          OPENSSL_PATH=$(brew --prefix openssl)
+
+          # 设置 MySQL 相关的环境变量，让 mysqlclient-sys 能找到库
+          echo "MYSQLCLIENT_LIB_DIR=$MYSQL_PATH/lib" >> $GITHUB_ENV
+          echo "MYSQLCLIENT_VERSION=8.0" >> $GITHUB_ENV # 这里的版本号通常跟随主版本
+          
+          # 将 mysql_config 加入 PATH，这是许多库寻找 mysql 配置的备选方案
+          echo "$MYSQL_PATH/bin" >> $GITHUB_PATH
+
+          # 设置 OpenSSL 环境变量
+          echo "OPENSSL_ROOT_DIR=$OPENSSL_PATH" >> $GITHUB_ENV
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
 
       - name: Build Vaultwarden
         run: |
-          # 开启所有必要的 features，例如 sqlite/mysql/postgresql
-          # --release 模式生成优化后的二进制文件
-          cargo build --release --target aarch64-apple-darwin --features sqlite,mysql,postgresql
+          # 显式指定 target 并开启 features
+          cargo build --release \
+            --target aarch64-apple-darwin \
+            --features sqlite,mysql,postgresql
 
       - name: Prepare Artifact
         run: |
           mkdir -p output
           cp target/aarch64-apple-darwin/release/vaultwarden ./output/
-          # 复制 web-vault (如果你的仓库里没有集成，可能需要单独处理前端)
-          # 注意：Vaultwarden 运行通常需要 web-vault 静态文件
 
       - name: Upload Binary
         uses: actions/upload-artifact@v4
         with:
           name: vaultwarden-macos-m4
-          path: ./output/vaultwarden
+          path: ./output/vaultwarden
\ No newline at end of file