Explorar el Código

Add CI for build-ios

ithewei hace 3 años
padre
commit
152ace9b6d
Se han modificado 3 ficheros con 31 adiciones y 13 borrados
  1. 25 12
      .github/workflows/CI.yml
  2. 1 1
      BUILD.md
  3. 5 0
      CMakeLists.txt

+ 25 - 12
.github/workflows/CI.yml

@@ -15,24 +15,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
       - name: build
         run: |
           sudo apt update
           sudo apt install libssl-dev libnghttp2-dev
           ./configure --with-openssl --with-nghttp2
           make libhv evpp
-          make check
-          make run-unittest
 
-  build-macos:
-    name: build-macos
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: build
+      - name: test
         run: |
-          ./configure
-          make libhv evpp examples unittest
+          make check
+          make run-unittest
 
   build-windows:
     name: build-windows
@@ -41,7 +35,26 @@ jobs:
       - uses: actions/checkout@v2
       - name: build
         run: |
-          mkdir win64
-          cd win64
+          mkdir cmake-build-win64
+          cd cmake-build-win64
           cmake .. -G "Visual Studio 17 2022" -A x64
           cmake --build .
+
+  build-apple:
+    name: build-apple
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: build-mac
+        run: |
+          ./configure
+          make libhv evpp examples unittest
+
+      - name: build-ios
+        run: |
+          mkdir cmake-build-ios
+          cd cmake-build-ios
+          cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake -DPLATFORM=OS -DDEPLOYMENT_TARGET=9.0 -DARCHS="armv7 arm64"
+          cmake --build . --target hv_static --config Release
+

+ 1 - 1
BUILD.md

@@ -83,7 +83,7 @@ make libhv
 ```
 mkdir build
 cd build
-cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake -DPLATFORM=OS
+cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake -DPLATFORM=OS -DDEPLOYMENT_TARGET=9.0 -DARCHS="armv7 arm64"
 cmake --build . --target hv_static --config Release
 ```
 

+ 5 - 0
CMakeLists.txt

@@ -40,6 +40,11 @@ if(WIN32)
     endif()
 endif()
 
+if(IOS)
+    set(BUILD_SHARED OFF)
+    set(BUILD_EXAMPLES OFF)
+endif()
+
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
 include(utils)
 include(vars)