Modify README

KangLin · Feb 23, 2024 · 21bf783 · 21bf783
1 parent ac29b1c
commit 21bf783
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -108,7 +108,7 @@ jobs:
           7z a SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_macos.zip install/.
 
       - name: test run
-        if: ${{ matrix.BUILD_TYPE == 'Release' }}
+        if: false # ${{ matrix.BUILD_TYPE == 'Release' }}
         working-directory: ${{github.workspace}}/build
         run: |
           ./install/bin/SerialPortAssistant.sh

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,10 @@
 + Version: v0.5.21
   - Fix deploy.sh bug
-  - CI: copy openssl dll
+  - CI: copy openssl dll in windows. See: https://github.com/KangLin/RabbitCommon/commit/673aa9198ec1f88eb1f9f265d0b85f613ee86418
+  - Fix android resource
+  - MacOS can now be successfully compiled in CI.
+    but the loading dynamic library path is not set correctly.
+    Please help you set it.
 
 + Version: v0.5.20
   - Modify deploy.sh

diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md
@@ -1,6 +1,8 @@
 + 版本: v0.5.21
   - 修复 deploy.sh 错误
-  - 修复复制 openssl 库错误
+  - 修复在 windows 下复制 openssl 库错误。详见：https://github.com/KangLin/RabbitCommon/commit/673aa9198ec1f88eb1f9f265d0b85f613ee86418
+  - 修复 android 资源错误
+  - 当前在自动化编译中能成功编译 macos 。但是未能正确设置动态库的加载路径。请会的朋友帮助我设置。
 
 + 版本: v0.5.20
   - 修改 deploy.sh

diff --git a/README.md b/README.md
@@ -37,8 +37,11 @@ Author: Kang Lin ([email protected])
   + [x] linux
   + [x] Android
   + [x] mac, os  
-    Mac os, I don't have the corresponding equipment,
+    - Mac os, I don't have the corresponding equipment,
     please compile and test the user with the corresponding equipment.
+    - Currently compiles successfully.
+    but the loading dynamic library path is not set correctly.
+    Please help you set it.
 
   See: [Qt5 supported platforms](https://doc.qt.io/qt-5/supported-platforms.html), [Qt6 supported platforms](https://doc.qt.io/qt-6/supported-platforms.html).
 - Multi-language

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -36,7 +36,9 @@
   + [x] WINDOWS
   + [x] Linux
   + [x] Android
-  + [x] mac、os  本人没有mac设备，请有些设备的同学自行编译和测试
+  + [x] mac、os
+    - 本人没有mac设备，请有些设备的同学自行编译和测试
+    - 当前可以成功编译，但是没有正确设置加载动态库路径。请会设置的朋友帮助设置。
 
   详见：[Qt5 支持平台](https://doc.qt.io/qt-5/supported-platforms.html)、[Qt6 支持平台](https://doc.qt.io/qt-6/supported-platforms.html)。
 - 程序截屏