Fix macos 'include folder missing' bug, add more ci machines

Privatehive · Dec 20, 2024 · 27075a1 · 27075a1
1 parent 78d274a
commit 27075a1
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,39 +2,75 @@ name: "Create Conan Package"
 on: push
 
 jobs:
-  build_linux:
+  build_linux_x86_64:
     name: "Linux"
     uses: Privatehive/conan-workflows/.github/workflows/createPackage.yml@master
     with:
-      image: "ghcr.io/privatehive/conan-ubuntu:latest"
-      machine_type: c2d-standard-8
+      image: "ubuntu-20.04"
       conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
-      conan_options: "qt/*:shared=True,qt/*:GUI=True,qt/*:opengl=desktop,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
+      conan_options: "qt/*:GUI=True,qt/*:opengl=desktop,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
 
-  build_windows:
+  build_windows_x86_64:
     name: "Windows"
     uses: Privatehive/conan-workflows/.github/workflows/createPackage.yml@master
     with:
-      image: "ghcr.io/privatehive/conan-wine:latest"
-      machine_type: c2d-standard-8
+      image: "windows-2022"
       conan_host_profile: "windowsMinGW"
       conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
       conan_options: "qt/*:GUI=True,qt/*:opengl=desktop,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
 
-  build_android:
-    name: "Android"
+  build_macos_armv8:
+    name: "Macos"
     uses: Privatehive/conan-workflows/.github/workflows/createPackage.yml@master
     with:
-      image: "ghcr.io/privatehive/conan-ubuntu:latest"
+      image: "macos-14"
+      conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
+      conan_options: "qt/*:GUI=True,qt/*:opengl=desktop,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
+
+  build_android_x86:
+    name: "Android"
+    uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
+    with:
+      docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
+      machine_type: c2d-standard-8
+      conan_host_profile: "androidx86"
+      conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
+      conan_options: "qt/*:GUI=True,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
+
+  build_android_x86_64:
+    name: "Android"
+    uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
+    with:
+      docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
+      machine_type: c2d-standard-8
+      conan_host_profile: "androidx86_64"
+      conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
+      conan_options: "qt/*:GUI=True,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
+
+  build_android_armv7:
+    name: "Android"
+    uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
+    with:
+      docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
+      machine_type: c2d-standard-8
+      conan_host_profile: "androidArmv7"
+      conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
+      conan_options: "qt/*:GUI=True,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
+
+  build_android_armv8:
+    name: "Android"
+    uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
+    with:
+      docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
       machine_type: c2d-standard-8
       conan_host_profile: "androidArmv8"
       conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan
-      conan_options: "qt/*:shared=True,qt/*:GUI=True,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
+      conan_options: "qt/*:GUI=True,qt/*:qtbase=True,qt/*:widgets=True,qt/*:qtdeclarative=True,qt/*:qtsvg=True"
 
   upload_recipe:
     name: "Finalize"
     uses: Privatehive/conan-workflows/.github/workflows/uploadRecipe.yml@master
-    needs: [build_linux, build_windows, build_android]
+    needs: [ build_linux_x86_64, build_windows_x86_64, build_macos_armv8, build_android_x86, build_android_x86_64, build_android_armv7, build_android_armv8 ]
     if: ${{ success() }}
     secrets: inherit
     with:

diff --git a/README.md b/README.md
@@ -10,4 +10,8 @@
 | --------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `Linux`   | `x86_64` | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
 | `Windows` | `x86_64` | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
+| `Macos`   | `armv8`  | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
+| `Android` | `x86`    | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
+| `Android` | `x86_64` | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
+| `Android` | `armv7`  | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
 | `Android` | `armv8`  | [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/Privatehive/conan-Qt/main.yml?branch=master&style=flat&logo=github&label=create+package)](https://github.com/Privatehive/conan-Qt/actions?query=branch%3Amaster) |
diff --git a/conanfile.py b/conanfile.py
@@ -492,6 +492,7 @@ def build(self):
         cmake.build()
 
     def package(self):
+        os.mkdir(os.path.join(self.package_folder, "include")) # macos: if only qtcore is built, include folder is missing but required by find_package(Qt6 REQUIRED Core)
         cmake = CMake(self)
         cmake.install()