From d9ea62a670c9aa92badf20ea5ab31d4a77e5cdd3 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 16 Sep 2022 22:21:58 +1000 Subject: [PATCH] Distribute Apple M1 to PyPi --- .github/workflows/ci-ifcopenshell-pypi.yml | 4 ++++ src/ifcopenshell-python/Makefile | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-ifcopenshell-pypi.yml b/.github/workflows/ci-ifcopenshell-pypi.yml index ce8102ea6c..1d95cb9911 100644 --- a/.github/workflows/ci-ifcopenshell-pypi.yml +++ b/.github/workflows/ci-ifcopenshell-pypi.yml @@ -43,6 +43,10 @@ jobs: name: "MacOS Build", short_name: macos } + - { + name: "MacOS ARM Build", + short_name: macosm1 + } steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 # https://github.com/actions/setup-python diff --git a/src/ifcopenshell-python/Makefile b/src/ifcopenshell-python/Makefile index 300f10e8a4..571927fded 100644 --- a/src/ifcopenshell-python/Makefile +++ b/src/ifcopenshell-python/Makefile @@ -24,10 +24,20 @@ endif ifeq ($(PLATFORM), macos) PLATFORMTAG:=macosx_10_15_x86_64 endif +ifeq ($(PLATFORM), macosm1) +PLATFORMTAG:=macosx_11_0_arm64 +endif ifeq ($(PLATFORM), win) PLATFORMTAG:=win_amd64 endif +ifeq ($(PLATFORM), macosm1) +ifeq ($(PYVERSION), py36) +# Pure Evil. Let me know if you're the first to file a bug report. +PYNUMBER:=37 +endif +endif + .PHONY: test test: pytest -p no:pytest-blender test @@ -67,7 +77,7 @@ endif mkdir -p dist/ifcopenshell cp -r ifcopenshell/* dist/ifcopenshell/ - cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-dc67287-$(PLATFORM)64.zip + cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcopenshell-python-$(PYNUMBER)-v0.7.0-4fb910f-$(PLATFORM)64.zip cd dist/working && unzip ifcopenshell-python* cp -r dist/working/ifcopenshell/ifcopenshell_wrapper.py dist/ifcopenshell/ ifeq ($(PLATFORM), win)