simplify macOS targets and try arm64 craft target

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2024-04-26 13:47:47 +02:00
parent aa38a0180d
commit d4986e15f8
2 changed files with 3 additions and 18 deletions

View file

@ -7,7 +7,7 @@ jobs:
name: macOS Build and Test
runs-on: macos-latest
env:
CRAFT_TARGET: macos-64-clang
CRAFT_TARGET: macos-clang-arm64
CRAFT_MASTER_LOCATION: ${{ github.workspace }}/CraftMaster
CRAFT_MASTER_CONFIG: ${{ github.workspace }}/craftmaster.ini
steps:

View file

@ -17,10 +17,6 @@ CreateCache = False
General/MacDeploymentTarget = 12.0
## This is the location of your python installation.
## This value must be set.
Paths/Python = C:\Python312-x64
Compile/BuildType = RelWithDebInfo
Compile/UseNinja = True
@ -49,25 +45,14 @@ binary/mysql.useMariaDB = False
[windows-msvc2022_64-cl]
QtSDK/Compiler = msvc2022_64
General/ABI = windows-msvc2022_64-cl
[windows-msvc2019_64-cl]
QtSDK/Compiler = msvc2019_64
General/ABI = windows-msvc2019_64-cl
Paths/Python = C:\Python312-x64
[macos-64-clang]
General/ABI = macos-64-clang
# Packager/PackageType = MacPkgPackager
[macos-64-clang-debug]
General/ABI = macos-64-clang
Compile/BuildType = Debug
[macos-clang-arm64]
General/ABI = macos-clang-arm64
[macos-clang-arm64-debug]
General/ABI = macos-clang-arm64
Compile/BuildType = Debug
Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64
[Env]
CRAFT_CODESIGN_CERTIFICATE =