From 27075a1687050544655e4d1c9c2c64f318918c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stresing?= Date: Fri, 20 Dec 2024 17:11:52 +0100 Subject: [PATCH] Fix macos 'include folder missing' bug, add more ci machines --- .github/workflows/main.yml | 60 ++++++++++++++++++++++++++++++-------- README.md | 4 +++ conanfile.py | 1 + 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cdf718..47deb19 100644 --- 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 index 4ed6fa6..650a8ec 100644 --- 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 index dbf08c4..b295096 100644 --- 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()