From e15b51178ac027d2cc3b8780031faa691884ba3f Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 20:52:13 -0700 Subject: [PATCH 1/9] Switch to multibuild main branch --- multibuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild.sh b/multibuild.sh index c5b50fa..2025119 100755 --- a/multibuild.sh +++ b/multibuild.sh @@ -4,7 +4,7 @@ export BUILD_COMMIT=$TRAVIS_COMMIT export PLAT=x86_64 export MB_PYTHON_VERSION=$PY_VER -git clone https://github.com/matthew-brett/multibuild && cd multibuild && git checkout 254ad28 && cd .. +git clone https://github.com/matthew-brett/multibuild && cd multibuild && cd .. source multibuild/common_utils.sh source multibuild/travis_steps.sh before_install From 165d849a1fd6f1f6534172c1058ca3c9432f85cd Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 21:12:30 -0700 Subject: [PATCH 2/9] Add Python 3.8 and 3.9 builds to CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 53e24b3..87b1609 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ env: - PY_VER=3.6 - PY_VER=3.7 - PY_VER=3.5 +- PY_VER=3.8 +- PY_VER=3.9 osx_image: xcode8.3 matrix: exclude: From 813b5c6b68da7ee2959ae3ee6dc66e21fce9f2a3 Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 21:27:35 -0700 Subject: [PATCH 3/9] Add more build architectures --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 87b1609..cc28ffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ os: - linux - windows - osx +arch: +- amd64 +- arm64 env: - PY_VER=3.6 - PY_VER=3.7 From f7edf0593f731bdf0e14941c784ef2e2c5a70994 Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 21:49:09 -0700 Subject: [PATCH 4/9] Pass arch flag into multibuild --- multibuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild.sh b/multibuild.sh index 2025119..5de3f84 100755 --- a/multibuild.sh +++ b/multibuild.sh @@ -1,7 +1,7 @@ set -ex export REPO_DIR=. export BUILD_COMMIT=$TRAVIS_COMMIT -export PLAT=x86_64 +export PLAT=$TRAVIS_CPU_ARCH export MB_PYTHON_VERSION=$PY_VER git clone https://github.com/matthew-brett/multibuild && cd multibuild && cd .. From 1125a68dae1e335bde0969aca7b6cb04535f9b13 Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 21:56:23 -0700 Subject: [PATCH 5/9] Use docker-compatible arch flags --- multibuild.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/multibuild.sh b/multibuild.sh index 5de3f84..fcb35c1 100755 --- a/multibuild.sh +++ b/multibuild.sh @@ -1,8 +1,12 @@ set -ex export REPO_DIR=. export BUILD_COMMIT=$TRAVIS_COMMIT -export PLAT=$TRAVIS_CPU_ARCH +export PLAT=x86_64 export MB_PYTHON_VERSION=$PY_VER +if [[ $TRAVIS_CPU_ARCH -eq "arm64" ]] +then + export PLAT=aarch64 +fi git clone https://github.com/matthew-brett/multibuild && cd multibuild && cd .. source multibuild/common_utils.sh From 271b10180f6256ee8fe11e7c423d8115868e5a71 Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 22:11:40 -0700 Subject: [PATCH 6/9] Switch to use manylinux2014 container for builds --- multibuild.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multibuild.sh b/multibuild.sh index fcb35c1..d0370b2 100755 --- a/multibuild.sh +++ b/multibuild.sh @@ -3,7 +3,8 @@ export REPO_DIR=. export BUILD_COMMIT=$TRAVIS_COMMIT export PLAT=x86_64 export MB_PYTHON_VERSION=$PY_VER -if [[ $TRAVIS_CPU_ARCH -eq "arm64" ]] +export MB_ML_VER=2014 +if [[ $TRAVIS_CPU_ARCH == "arm64" ]] then export PLAT=aarch64 fi From 73276c48a19659ff1a174c036f50a608b4f26b1d Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 22:29:26 -0700 Subject: [PATCH 7/9] Specify test image for arm64 builds --- multibuild.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/multibuild.sh b/multibuild.sh index d0370b2..c4e59fa 100755 --- a/multibuild.sh +++ b/multibuild.sh @@ -7,6 +7,7 @@ export MB_ML_VER=2014 if [[ $TRAVIS_CPU_ARCH == "arm64" ]] then export PLAT=aarch64 + export DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 fi git clone https://github.com/matthew-brett/multibuild && cd multibuild && cd .. From 3fe3b4aebd19f240e8df0b7b80c00996cb7bd7f6 Mon Sep 17 00:00:00 2001 From: adversariel Date: Wed, 12 May 2021 22:42:10 -0700 Subject: [PATCH 8/9] Remove legacy python 3.5 build --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc28ffa..19052d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ arch: env: - PY_VER=3.6 - PY_VER=3.7 -- PY_VER=3.5 - PY_VER=3.8 - PY_VER=3.9 osx_image: xcode8.3 From a1b522825b46e866999dc987be6b4db180e22134 Mon Sep 17 00:00:00 2001 From: adversariel Date: Thu, 13 May 2021 14:52:53 -0700 Subject: [PATCH 9/9] Pinned multibuild to latest version --- multibuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild.sh b/multibuild.sh index c4e59fa..f8e4837 100755 --- a/multibuild.sh +++ b/multibuild.sh @@ -10,7 +10,7 @@ then export DOCKER_TEST_IMAGE=multibuild/xenial_arm64v8 fi -git clone https://github.com/matthew-brett/multibuild && cd multibuild && cd .. +git clone https://github.com/matthew-brett/multibuild && cd multibuild && git checkout 45d97819e7d39dd2264b2c3cd353c26c4e1ebb74 && cd .. source multibuild/common_utils.sh source multibuild/travis_steps.sh before_install