From 79b444cc8f11fc65144db58dae2bd1c47c22aa54 Mon Sep 17 00:00:00 2001 From: jswhit Date: Wed, 23 Mar 2022 11:12:26 -0600 Subject: [PATCH 1/2] split native and cross-compiled wheel builds for osx --- .github/workflows/build-wheels-macosx.yml | 4 ++-- .github/workflows/build-wheels-macosx2.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels-macosx.yml b/.github/workflows/build-wheels-macosx.yml index f73ac71..dfd0647 100644 --- a/.github/workflows/build-wheels-macosx.yml +++ b/.github/workflows/build-wheels-macosx.yml @@ -33,12 +33,14 @@ jobs: MB_ML_VER: 2014 BUILD_COMMIT: v1.5.8rel UNICODE_WIDTH: 32 + PLAT: universal2 MB_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_REPO_SLUG: ${{ github.repository }} TRAVIS_BRANCH: ${{ github.head_ref }} TRAVIS_PULL_REQUEST: ${{ github.event.number }} TRAVIS_BUILD_DIR: ${{ github.workspace }} + TRAVIS_OS_NAME: osx MULTIBUILD_WHEELS_STAGING_ACCESS: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }} steps: @@ -55,8 +57,6 @@ jobs: if [ "schedule" == "${{ github.event_name }}" ] || [ "master" == "$BUILD_COMMIT" ]; then echo "TOKEN=$SCIPY_WHEELS_NIGHTLY_ACCESS" >> $GITHUB_ENV; else echo "TOKEN=$MULTIBUILD_WHEELS_STAGING_ACCESS" >> $GITHUB_ENV; fi if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi - echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV - echo "PLAT=universal2" >> $GITHUB_ENV - name: Pin Numpy version run: | diff --git a/.github/workflows/build-wheels-macosx2.yml b/.github/workflows/build-wheels-macosx2.yml index 23fabaa..6ee366f 100644 --- a/.github/workflows/build-wheels-macosx2.yml +++ b/.github/workflows/build-wheels-macosx2.yml @@ -33,12 +33,14 @@ jobs: MB_ML_VER: 2014 BUILD_COMMIT: v1.5.8rel UNICODE_WIDTH: 32 + PLAT:x86_64 MB_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_REPO_SLUG: ${{ github.repository }} TRAVIS_BRANCH: ${{ github.head_ref }} TRAVIS_PULL_REQUEST: ${{ github.event.number }} TRAVIS_BUILD_DIR: ${{ github.workspace }} + TRAVIS_OS_NAME: osx MULTIBUILD_WHEELS_STAGING_ACCESS: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }} steps: From f390c0a37d3b7d89358cbead9c262fb5a3cbf9f9 Mon Sep 17 00:00:00 2001 From: jswhit Date: Wed, 23 Mar 2022 11:37:28 -0600 Subject: [PATCH 2/2] update --- .github/workflows/build-wheels-macosx2.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-wheels-macosx2.yml b/.github/workflows/build-wheels-macosx2.yml index 6ee366f..c35e5fe 100644 --- a/.github/workflows/build-wheels-macosx2.yml +++ b/.github/workflows/build-wheels-macosx2.yml @@ -1,7 +1,7 @@ # This workflow will install Python dependencies, run tests and build # manylinux wheels for a variety of python versions and architectures. -name: Build and upload macosx wheels for x86_64 +name: Build and upload macosx wheels (x86_64) on: push: @@ -33,7 +33,7 @@ jobs: MB_ML_VER: 2014 BUILD_COMMIT: v1.5.8rel UNICODE_WIDTH: 32 - PLAT:x86_64 + PLAT: x86_64 MB_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }} TRAVIS_REPO_SLUG: ${{ github.repository }} @@ -57,7 +57,6 @@ jobs: if [ "schedule" == "${{ github.event_name }}" ] || [ "master" == "$BUILD_COMMIT" ]; then echo "TOKEN=$SCIPY_WHEELS_NIGHTLY_ACCESS" >> $GITHUB_ENV; else echo "TOKEN=$MULTIBUILD_WHEELS_STAGING_ACCESS" >> $GITHUB_ENV; fi if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi - echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV - name: Pin Numpy version run: |