From df5388cfedfa93ae8f3822d8f562edda1861bfae Mon Sep 17 00:00:00 2001 From: Omar Emara Date: Sat, 10 Feb 2024 13:04:39 +0200 Subject: [PATCH] Add ARM MacOS builder to build workflow (#1948) Also add the machine identifier to the exported addon name. --- .github/workflows/build.yml | 2 +- setup.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11176a27f..5597c61c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest, macos-14] python: ['3.11'] steps: - name: Checkout diff --git a/setup.py b/setup.py index 193c8b055..b085e9912 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ import sys import json import textwrap +import platform import subprocess from pprint import pprint @@ -36,8 +37,8 @@ elif onWindows: currentOS = "windows" elif onMacOS: currentOS = "macOS" addonVersion = getAddonVersion(initPath) -exportName = "{}_v{}_{}_{}_py{}{}".format( - addonName, *addonVersion[:2], currentOS, *sys.version_info[:2]) +exportName = "{}_v{}_{}_{}_{}_py{}{}".format( + addonName, *addonVersion[:2], currentOS, platform.machine(), *sys.version_info[:2]) exportPath = os.path.join(currentDirectory, exportName + ".zip") exportCPath = os.path.join(currentDirectory, "{}_c.zip".format(addonName))