From 6113328f8fa9af759811b44835c9cb2229be5a77 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 24 Aug 2022 20:10:38 +0100 Subject: [PATCH] remove macos arm64 builds --- .github/workflows/build.yml | 192 ++++++++++++++++++------------------ version.py | 2 +- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d655fa..7881841 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,102 +60,102 @@ jobs: name: wheel path: dist/* - build-mac12-arm64: - runs-on: macos-12 - strategy: - matrix: - python-version: ['3.10', '3.11.0-alpha - 3.11.0' ] - # Requires universal2 build of python, which we get if we ask for 3.10.5 x86! Pypy not available in universal2 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Setup Python - uses: actions/setup-python@v2.2.2 - with: - python-version: ${{ matrix.python-version }} - architecture: x64 - - # Only build raylib for arm64 (although we could make a fat universal2 binary by asking for x86_64 as well) - - name: Build raylib - run: | - cd raylib-c - mkdir build - cd build - cmake -DBUILD_EXAMPLES=off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DINCLUDE_EVERYTHING=on -DSUPPORT_FILEFORMAT_JPG=on -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release .. - make -j2 - sudo make install - - name: Copy extras - run: | - sudo cp physac/src/physac.h /usr/local/include/ - sudo cp raygui/src/raygui.h /usr/local/include/ - - # Name defaults to universal2 and it technically is, but we override name to arm64. Why don't we make a working universal2 wheel? Because - # I'd rather have a separate x86_64 that I can test, and I want it to work on 10_15 but I'm not sure a 'macosx_10_15_universal2' is valid - # given that there is no SDK for universal until macosx_11_0 - - name: Build raylib-python-cffi - run: | - python -m pip install --upgrade pip - pip3 install cffi - pip3 install wheel - python setup.py bdist_wheel --plat-name macosx_12_0_arm64 - - - - name: Upload build Artifact wheel - uses: actions/upload-artifact@v2.2.4 - with: - name: wheel - path: dist/* - - - build-mac11-arm64: - runs-on: macos-11 - strategy: - matrix: - python-version: [ '3.10.5' ] - # Requires universal2 build of python, which we get if we ask for 3.10.5 x86! Pypy not available in universal2 - env: - MACOSX_DEPLOYMENT_TARGET: 11.6 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Setup Python - uses: actions/setup-python@v2.2.2 - with: - python-version: ${{ matrix.python-version }} - architecture: x64 - - # build raylib for arm64 and x86_64 as well - - name: Build raylib - run: | - cd raylib-c - mkdir build - cd build - cmake -DBUILD_EXAMPLES=off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DINCLUDE_EVERYTHING=on -DSUPPORT_FILEFORMAT_JPG=on -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release .. - make -j2 - sudo make install - - name: Copy extras - run: | - sudo cp physac/src/physac.h /usr/local/include/ - sudo cp raygui/src/raygui.h /usr/local/include/ - - - - name: Build raylib-python-cffi - run: | - python -m pip install --upgrade pip - pip3 install cffi - pip3 install wheel - python setup.py bdist_wheel --plat-name macosx_11_0_arm64 - - - name: Upload build Artifact wheel - uses: actions/upload-artifact@v2.2.4 - with: - name: wheel - path: dist/* - +# build-mac12-arm64: +# runs-on: macos-12 +# strategy: +# matrix: +# python-version: ['3.10', '3.11.0-alpha - 3.11.0' ] +# # Requires universal2 build of python, which we get if we ask for 3.10.5 x86! Pypy not available in universal2 +# steps: +# - uses: actions/checkout@v2 +# with: +# submodules: recursive +# +# - name: Setup Python +# uses: actions/setup-python@v2.2.2 +# with: +# python-version: ${{ matrix.python-version }} +# architecture: x64 +# +# # Only build raylib for arm64 (although we could make a fat universal2 binary by asking for x86_64 as well) +# - name: Build raylib +# run: | +# cd raylib-c +# mkdir build +# cd build +# cmake -DBUILD_EXAMPLES=off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DINCLUDE_EVERYTHING=on -DSUPPORT_FILEFORMAT_JPG=on -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release .. +# make -j2 +# sudo make install +# - name: Copy extras +# run: | +# sudo cp physac/src/physac.h /usr/local/include/ +# sudo cp raygui/src/raygui.h /usr/local/include/ +# +# # Name defaults to universal2 and it technically is, but we override name to arm64. Why don't we make a working universal2 wheel? Because +# # I'd rather have a separate x86_64 that I can test, and I want it to work on 10_15 but I'm not sure a 'macosx_10_15_universal2' is valid +# # given that there is no SDK for universal until macosx_11_0 +# - name: Build raylib-python-cffi +# run: | +# python -m pip install --upgrade pip +# pip3 install cffi +# pip3 install wheel +# python setup.py bdist_wheel --plat-name macosx_12_0_arm64 +# +# +# - name: Upload build Artifact wheel +# uses: actions/upload-artifact@v2.2.4 +# with: +# name: wheel +# path: dist/* +# +# +# build-mac11-arm64: +# runs-on: macos-11 +# strategy: +# matrix: +# python-version: [ '3.10.5' ] +# # Requires universal2 build of python, which we get if we ask for 3.10.5 x86! Pypy not available in universal2 +# env: +# MACOSX_DEPLOYMENT_TARGET: 11.6 +# steps: +# - uses: actions/checkout@v2 +# with: +# submodules: recursive +# +# - name: Setup Python +# uses: actions/setup-python@v2.2.2 +# with: +# python-version: ${{ matrix.python-version }} +# architecture: x64 +# +# # build raylib for arm64 and x86_64 as well +# - name: Build raylib +# run: | +# cd raylib-c +# mkdir build +# cd build +# cmake -DBUILD_EXAMPLES=off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DINCLUDE_EVERYTHING=on -DSUPPORT_FILEFORMAT_JPG=on -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release .. +# make -j2 +# sudo make install +# - name: Copy extras +# run: | +# sudo cp physac/src/physac.h /usr/local/include/ +# sudo cp raygui/src/raygui.h /usr/local/include/ +# +# +# - name: Build raylib-python-cffi +# run: | +# python -m pip install --upgrade pip +# pip3 install cffi +# pip3 install wheel +# python setup.py bdist_wheel --plat-name macosx_11_0_arm64 +# +# - name: Upload build Artifact wheel +# uses: actions/upload-artifact@v2.2.4 +# with: +# name: wheel +# path: dist/* +# build-linux: diff --git a/version.py b/version.py index 4457fbe..b844ec1 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = "4.2.1.0" \ No newline at end of file +__version__ = "4.2.1.1" \ No newline at end of file