Work on CI builds

emericg · Sep 24, 2023 · f327e85 · f327e85
1 parent 721138f
commit f327e85
Show file tree

Hide file tree

Showing 5 changed files with 1,114 additions and 12 deletions.
diff --git a/.github/workflows/builds_desktop.yml b/.github/workflows/builds_desktop.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       # Checkout the repository (and submodules)
       - name: Checkout repository (and submodules)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

diff --git a/.github/workflows/builds_desktop_cmake.yml b/.github/workflows/builds_desktop_cmake.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       # Checkout the repository (and submodules)
       - name: Checkout repository (and submodules)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

diff --git a/.github/workflows/builds_mobile.yml b/.github/workflows/builds_mobile.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       # Checkout the repository (and submodules)
       - name: Checkout repository (and submodules)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -75,7 +75,7 @@ jobs:
   ## iOS build #################################################################
   build-ios:
     name: "iOS CI build"
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       # Checkout the repository (and submodules)
       - name: Checkout repository (and submodules)

diff --git a/.github/workflows/builds_mobile_cmake.yml b/.github/workflows/builds_mobile_cmake.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       # Checkout the repository (and submodules)
       - name: Checkout repository (and submodules)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -75,14 +75,18 @@ jobs:
       # Build application
       - name: Build application
         run: |
-             cd build/
-             qt-cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-23 ..
-             cmake --build .
+             qt-cmake -B build/ -DCMAKE_SYSTEM_NAME=Android \
+                -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_SDK_ROOT}}/build/cmake/android.toolchain.cmake \
+                -DANDROID_SDK_ROOT=${{env.ANDROID_SDK_ROOT}} \
+                -DANDROID_NDK_ROOT=${{env.ANDROID_NDK_ROOT}} \
+                -DANDROID_PLATFORM=android-23 \
+                -DQT_ANDROID_BUILD_ALL_ABIS
+             cmake --build build/ --config Release
 
   ## iOS build #################################################################
   build-ios:
     name: "iOS CI build"
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       # Checkout the repository (and submodules)
       - name: Checkout repository (and submodules)
@@ -117,6 +121,5 @@ jobs:
       # Build application
       - name: Build application
         run: |
-             cd build/
-             qt-cmake -DCMAKE_SYSTEM_NAME=iOS ..
-             cmake --build .
+             qt-cmake -B build/ -G Xcode -DCMAKE_TOOLCHAIN_FILE=assets/ios/ios.toolchain.cmake -DPLATFORM=OS64
+             cmake --build build/ --config Release