Skip to content

Commit 097db15

Browse files
committed
Try fix to platform
1 parent dcd87ed commit 097db15

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.github/workflows/build.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
88

99
if [[ "$PLAT" == "arm64" ]]; then
1010
export MACOSX_DEPLOYMENT_TARGET="11.0"
11+
CMD_SUFFIX='arch -arm64'
1112
else
1213
export MACOSX_DEPLOYMENT_TARGET="10.10"
1314
fi
@@ -20,20 +21,21 @@ fi
2021
echo "::group::Install a virtualenv"
2122
source multibuild/common_utils.sh
2223
source multibuild/travis_steps.sh
23-
python3 -m pip install virtualenv
2424
before_install
25+
export PIP_CMD="$CMD_SUFFIX $PIP_CMD"
26+
export PYTHON_EXE="$CMD_SUFFIX $PYTHON_EXE"
2527
echo "::endgroup::"
2628

2729
echo "::group::Build wheel"
2830
export WHEEL_SDIR=wheelhouse
29-
pip install tomlkit
30-
export BUILD_DEPENDS=$(python ./print_deps.py ${MB_PYTHON_VERSION} ${REPO_DIR})
31+
$PIP_CMD install tomlkit
32+
export BUILD_DEPENDS=$($PYTHON_EXE ./print_deps.py ${MB_PYTHON_VERSION} ${REPO_DIR})
3133
clean_code
3234
build_wheel
3335
ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/"
3436
echo "::endgroup::"
3537

3638
echo "::group::Test wheel"
37-
export TEST_DEPENDS=$(python ./print_deps.py ${MB_PYTHON_VERSION} ${REPO_DIR} -p test)
39+
export TEST_DEPENDS=$($PYTHON_EXE ./print_deps.py ${MB_PYTHON_VERSION} ${REPO_DIR} -p test)
3840
install_run
3941
echo "::endgroup::"

.github/workflows/wheels-macos.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ jobs:
2828
"3.12",
2929
]
3030
platform: [ "x86_64", "arm64" ]
31-
exclude:
32-
- python: "pypy3.9-7.3.12"
33-
platform: "arm64"
34-
- python: "pypy3.10-7.3.12"
35-
platform: "arm64"
3631
env:
3732
BUILD_COMMIT: ${{ inputs.build-commit }}
3833
PLAT: ${{ matrix.platform }}

0 commit comments

Comments
 (0)