diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-01-03 16:31:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-01-03 16:31:20 +0100 |
| commit | a986227c9529130663db41edec094c3b59e108ba (patch) | |
| tree | 10dbfef5aac0a0824b7a7d40111a2bfd1f398219 | |
| parent | 12f66d18ff79390bec5635eef397e84f10f37651 (diff) | |
| parent | ac32a163eb5e6d4c504bcf72090d814becce9380 (diff) | |
Merge remote-tracking branch 'origin/9.0'
Change-Id: I2ed18e5ad53cf243bcf75969a6acc302d3cb6c18
| -rw-r--r-- | .github/workflows/build_cmake.yml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 97dba40..4c7f708 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -4,9 +4,10 @@ on: [push] env: PLUGIN_NAME: Fossil - QT_VERSION: 6.4.0 - QT_CREATOR_VERSION: 9.0.0-beta1 - QT_CREATOR_SNAPSHOT: latest + 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 NINJA_VERSION: 1.10.2 @@ -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) |