diff options
author | Eike Ziller <eike.ziller@qt.io> | 2023-05-12 12:24:39 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2023-05-12 12:24:39 +0200 |
commit | 51df19270ba9a933732c369b47f0d4d80e7771f0 (patch) | |
tree | 9bc20e6aafd9179cb00d0b3efd77987d2d79ce45 /.github | |
parent | aca8e5906b83373d54025bae5c4ddb998ceff86c (diff) | |
parent | af5e50edf73b98fc7b995906b8ddd492756bff52 (diff) | |
download | qt-creator-51df19270ba9a933732c369b47f0d4d80e7771f0.tar.gz |
Merge remote-tracking branch 'origin/10.0'
Change-Id: I7cfdfc13097d5037fea597ecba98ae902a0c5afb
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/build_cmake.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 17cb3ea370..661b6365b2 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -577,7 +577,11 @@ jobs: endif() if ("${{ runner.os }}" STREQUAL "macOS") - set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") + if (${{github.ref}} MATCHES "tags/v(.*)") + set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") + else() + set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64") + endif() endif() execute_process( |