feat: update ci

barry-ran · Feb 25, 2024 · e4e1538 · e4e1538
1 parent 99a8210
commit e4e1538
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,10 +13,10 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: macos-10.15
+    runs-on: macos-11
     strategy:
       matrix:
-        qt-ver: [5.15.1]
+        qt-ver: [5.15.2]
         qt-arch-install: [clang_64]
         clang-arch: [x64]
     env:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,7 +24,7 @@ jobs:
     # 矩阵配置 https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstrategymatrix
     strategy:
       matrix:
-        qt-ver: [5.15.1]
+        qt-ver: [5.15.2]
         qt-arch: [win64_msvc2019_64, win32_msvc2019]
         # 配置qt-arch的额外设置msvc-arch，qt-arch-install
         include:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 project(all)
 
 add_subdirectory(QtScrcpy)
diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt
@@ -1,5 +1,5 @@
 # For VS2019 and Xcode 12+ support.
-cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
 
 #
 # Global config

diff --git a/ci/mac/build_for_mac.sh b/ci/mac/build_for_mac.sh
@@ -59,7 +59,7 @@ mkdir $build_path
 cd $build_path
 
 cmake_params="-DCMAKE_PREFIX_PATH=$qt_cmake_path -DCMAKE_BUILD_TYPE=$build_mode -G Xcode"
-cmake $cmake_params ../..
+cmake $cmake_params ../../QtScrcpy
 if [ $? -ne 0 ] ;then
     echo "cmake failed"
     exit 1