Work on CI builds

emericg · Sep 23, 2023 · e8eca6e · e8eca6e
1 parent 0a418a4
commit e8eca6e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/builds_mobile_cmake.yml b/.github/workflows/builds_mobile_cmake.yml
@@ -12,8 +12,8 @@ on:
 #-------------------------------------------------------------------------------
 
 env:
-  APPLICATION: "QmlAppTemplate"
-  APPLICATION_VERSION: "0.6"
+  APP_NAME: "QmlAppTemplate"
+  APP_VERSION: "0.6"
   QT_VERSION: "6.5.2"
 
 #-------------------------------------------------------------------------------
@@ -69,14 +69,14 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             echo "QT_HOST_PATH=/home/runner/work/${{env.APPLICATION}}/Qt/${{env.QT_VERSION}}/gcc_64" >> $GITHUB_ENV
+             echo "QT_HOST_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64" >> $GITHUB_ENV
              cmake --version
 
       # Build application
       - name: Build application
         run: |
              cd build/
-             cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_HOME}}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-23 ..
+             ${QT_HOST_PATH}/bin/qt-cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_TOOLCHAIN_FILE=${{env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-23 ..
              make -j$(nproc)
 
   ## iOS build #################################################################
@@ -110,7 +110,7 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             echo "QT_HOST_PATH=/Users/runner/work/${{env.APPLICATION}}/Qt/${{env.QT_VERSION}}/macos" >> $GITHUB_ENV
+             echo "QT_HOST_PATH=/Users/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/macos" >> $GITHUB_ENV
              cmake --version
 
       # Build application