sync pre-release

FuckDoctors · Jun 15, 2023 · f685539 · f685539
1 parent f490c95
commit f685539
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -88,20 +88,20 @@ jobs:
       run: |
         cd rdm/3rdparty/lz4/build/cmake
         cmake -G "${{ env.CMAKE_VS }}" -A x64 -DLZ4_BUNDLED_MODE=ON -DBUILD_SHARED_LIBS=ON -B .
-        cmake --build . --config "Release"
+        cmake --build . --config Release
 
     - name: build zstd
       run: |
         cd rdm/3rdparty/zstd/build/cmake
         cmake -G "${{ env.CMAKE_VS }}" -A x64 -B .
         cmake --build . --config Release
-        
+
     - name: build snappy
       run: |
         cd rdm/3rdparty/snappy
         cmake -G "${{ env.CMAKE_VS }}" -A x64 -B .
         cmake --build . --config Release
-        
+
     - name: build brotli
       run: |
         cd rdm/3rdparty/brotli
@@ -219,36 +219,38 @@ jobs:
       run: |
         cd rdm/3rdparty/zstd/build/cmake
         cmake . && make
-        
+
     - name: build snappy
       run: |
         cd rdm/3rdparty/snappy
+        git submodule update --remote
         cmake . && make
-        
+
     - name: build brotli
       run: |
         cd rdm/3rdparty/brotli
-        cmake -DCMAKE_BUILD_TYPE=Release
-        cmake --build . --config Release
+        cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
+        cmake --build . --config Release --target install
 
     # install QT   
     - name: install QT
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
       with: 
         version: '5.15.1'
         modules: 'qtcharts'
-
+        setup-python: 'false'
+
     - name: copy info.plist
       run: |
         cd rdm
         cd ./src && cp ./resources/Info.plist.sample ./resources/Info.plist
-    
+
 #     - name: setup python
 #       run: |
-#         brew unlink python@3.9
-#         brew install python@3.7
-#         brew link --overwrite python@3.7
-    
+#         brew unlink python@3.10
+#         brew install python@3.9
+#         brew link --overwrite python@3.9
+
     # 使用私有库,egg-links时-t不能同时使用，--user解决权限问题
     # https://github.com/UnitedIncome/serverless-python-requirements/issues/240
     # https://github.com/pypa/pip/issues/4390