Skip to content

Commit

Permalink
simplify macOS targets and try arm64 craft target
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien committed Apr 26, 2024
1 parent 1b34dcf commit 64654ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
19 changes: 2 additions & 17 deletions craftmaster.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down

0 comments on commit 64654ef

Please sign in to comment.