Work on CI builds

emericg · Nov 9, 2024 · 7046876 · 7046876
1 parent ce6d06b
commit 7046876
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/builds_desktop_cmake.yml b/.github/workflows/builds_desktop_cmake.yml
@@ -133,10 +133,10 @@ jobs:
           submodules: recursive
 
       # Configure MSVC
-      #- name: Configure MSVC
-      #  uses: ilammy/msvc-dev-cmd@v1
-      #  with:
-      #    arch: x86_64
+      - name: Configure MSVC
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x86_64
 
       # Install Qt
       - name: Install Qt
@@ -160,8 +160,8 @@ jobs:
       # Build application
       - name: Build application
         run: |
+             cmake -B build/ .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
              cd build/
-             cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release
              nmake
 
       # Deploy application

diff --git a/.github/workflows/builds_mobile_cmake.yml b/.github/workflows/builds_mobile_cmake.yml
@@ -130,6 +130,8 @@ jobs:
         run: |
              echo "QT_HOST_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64" >> $GITHUB_ENV
              echo "QT_TARGET_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/android_arm64_v8a" >> $GITHUB_ENV
+             cmake --version
+             qmake --version
 
       # Build application
       - name: Build application
@@ -177,7 +179,7 @@ jobs:
   ## iOS build #################################################################
   build-ios:
     name: "iOS CI build"
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       # Checkout repository (and submodules)
       - name: Checkout repository (and submodules)
@@ -204,6 +206,8 @@ jobs:
         run: |
              echo "QT_HOST_PATH=/Users/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/macos" >> $GITHUB_ENV
              echo "QT_TARGET_PATH=/Users/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/ios" >> $GITHUB_ENV
+             cmake --version
+             qmake --version
 
       # Build application
       - name: Build application
@@ -273,4 +277,3 @@ jobs:
         continue-on-error: true
         run: |
              ls build/
-             ls build/Release-iphoneos
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ even more tighly coupled features and tooling requirements anyway.
 
 ```bash
 $ git clone https://github.com/emericg/QmlAppTemplate.git --recursive
+$ cd QmlAppTemplate/
 $ cmake -B build/
 $ cmake --build build/
 ```