diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-01-02 14:22:21 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-01-02 13:44:08 +0000 |
| commit | ac32a163eb5e6d4c504bcf72090d814becce9380 (patch) | |
| tree | 712118375cea659cf43281fb8fb1649c9ab6923c /.github | |
| parent | 110332e920439a7ec41ba39b34e8700554d7208b (diff) | |
GitHub: Update deployment target and architectures on macOS
We only support macOS 10.14 with Qt Creator 9, and we
do support Apple ARM for a while now.
Change-Id: I4c3ac07b60cfed0d4f3444836748a995d6edfcc6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 29c0c43..4c7f708 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -5,6 +5,7 @@ on: [push] env: PLUGIN_NAME: Fossil QT_VERSION: 6.4.1 + MACOS_DEPLOYMENT_TARGET: 10.14 QT_CREATOR_VERSION: 9.0.0 QT_CREATOR_SNAPSHOT: NO CMAKE_VERSION: 3.21.1 @@ -202,7 +203,7 @@ jobs: run: | set(ENV{CC} ${{ matrix.config.cc }}) set(ENV{CXX} ${{ matrix.config.cxx }}) - set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.13") + set(ENV{MACOSX_DEPLOYMENT_TARGET} "${{ env.MACOS_DEPLOYMENT_TARGET }}") if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x") execute_process( @@ -227,6 +228,10 @@ jobs: endif() endforeach() + if("${{ runner.os }}" STREQUAL "macOS") + set(architecture_config "--add-config=-DCMAKE_OSX_ARCHITECTURES=x86_64\;arm64") + endif() + execute_process( COMMAND python -u @@ -237,6 +242,7 @@ jobs: --qt-path "${{ steps.qt.outputs.qt_dir }}" --qtc-path "${{ steps.qt_creator.outputs.qtc_dir }}" --output-path "$ENV{GITHUB_WORKSPACE}" + ${architecture_config} RESULT_VARIABLE result ) if (NOT result EQUAL 0) |