diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml index c1f216a012b10..5123be33b5bb5 100644 --- a/.github/workflows/macos-build-and-test.yml +++ b/.github/workflows/macos-build-and-test.yml @@ -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: diff --git a/craftmaster.ini b/craftmaster.ini index 20d481eb95783..fbd083ba7e4a0 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -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 =