From 309b4e504d7c142e12d27590cbc8223f7bf535fd Mon Sep 17 00:00:00 2001
From: fasiondog <fasiondog@163.com>
Date: Tue, 13 Aug 2024 15:02:41 +0800
Subject: [PATCH] update

---
 .github/workflows/macos_x86_64.yml | 28 ++++++++++++++--------------
 xmake.lua                          | 13 -------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/macos_x86_64.yml b/.github/workflows/macos_x86_64.yml
index 683064a..dc4e237 100644
--- a/.github/workflows/macos_x86_64.yml
+++ b/.github/workflows/macos_x86_64.yml
@@ -25,28 +25,28 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # - name: Cache packages
-      #   id: cache-xmake-macosx
-      #   uses: actions/cache@v4
-      #   env:
-      #     cache-name: cache-node-modules
-      #   with:
-      #     path: ~/.xmake
-      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-build-${{ env.cache-name }}-
-      #       ${{ runner.os }}-build-
-      #       ${{ runner.os }}-
+      - name: Cache packages
+        id: cache-xmake-macosx
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.xmake
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
 
       - uses: xmake-io/github-action-setup-xmake@v1
         with:
           xmake-version: 2.9.4
           actions-cache-folder: '.xmake-cache'
-          # actions-cache-key: 'macosx-x64'
+          actions-cache-key: 'macosx-x64'
 
       - name: config
         run: |
-          xmake f -c -k ${{ matrix.kind }} -y -vD --mo=y --mysql=y --http_client_zip=y --http_client_ssl=y
+          xmake f -c -k ${{ matrix.kind }} -y -vD --mo=y --mysql=n --http_client_zip=y --http_client_ssl=y
 
       - name: build
         run: |
diff --git a/xmake.lua b/xmake.lua
index 0729121..6d3d27c 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -118,19 +118,6 @@ if has_config("mysql") then
     else
         add_requires("mysql")
     end
-    if is_plat("macosx") then
-        if os.exists("/usr/local/opt/mysql-client/lib") then
-            -- add_includedirs("/usr/local/opt/mysql-client/include/mysql")
-            add_includedirs("/usr/local/opt/mysql-client/include")
-            add_linkdirs("/usr/local/opt/mysql-client/lib")
-            add_rpathdirs("/usr/local/opt/mysql-client/lib")
-        end
-        if os.exists("/usr/local/mysql/lib") then
-            add_linkdirs("/usr/local/mysql/lib")
-            add_rpathdirs("/usr/local/mysql/lib")
-        end
-        add_links("mysqlclient")
-    end
 end
 
 if has_config("http_client") or has_config("node") then