From 0b3e0124ab2ed59b4afd23f3461957aa7fc64990 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Apr 2022 14:58:25 +1000 Subject: [PATCH 1/6] LATEST is never set --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9378d6638..bfbe8e7b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,6 @@ before_install: install: # Maybe get and clean and patch source - - if [[ -n "$LATEST" ]]; then BUILD_COMMIT=main; fi - clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT - ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/" @@ -65,6 +64,5 @@ deploy: file_glob: true file: "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/*.whl" on: - condition: -z "$LATEST" repo: python-pillow/pillow-wheels skip_cleanup: true From c387e2ec33aedce9dfb074177a42eb6ce21e0bd1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Apr 2022 15:57:37 +1000 Subject: [PATCH 2/6] Travis PLAT is always aarch64 --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bfbe8e7b7..c39b2da85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ env: global: - REPO_DIR=Pillow - BUILD_COMMIT=HEAD - - PLAT=x86_64 + - PLAT=aarch64 - UNICODE_WIDTH=32 - BUILD_DEPENDS="" - TEST_DEPENDS="pytest pytest-timeout" @@ -18,28 +18,24 @@ jobs: - name: "3.7 Focal aarch64" arch: arm64 env: - - PLAT=aarch64 - MB_PYTHON_VERSION=3.7 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.8 Focal aarch64" os: linux arch: arm64 env: - - PLAT=aarch64 - MB_PYTHON_VERSION=3.8 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.9 Focal aarch64" os: linux arch: arm64 env: - - PLAT=aarch64 - MB_PYTHON_VERSION=3.9 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.10 Focal aarch64" os: linux arch: arm64 env: - - PLAT=aarch64 - MB_PYTHON_VERSION=3.10 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} From 0afce316c0413cb6399fd0e8ded0edbdaa26c4f9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Apr 2022 15:58:14 +1000 Subject: [PATCH 3/6] DOCKER_TEST_IMAGE is always multibuild/focal_{PLAT} --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c39b2da85..f3c757708 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - PLAT=aarch64 - UNICODE_WIDTH=32 - BUILD_DEPENDS="" + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - TEST_DEPENDS="pytest pytest-timeout" language: python @@ -19,25 +20,21 @@ jobs: arch: arm64 env: - MB_PYTHON_VERSION=3.7 - - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.8 Focal aarch64" os: linux arch: arm64 env: - MB_PYTHON_VERSION=3.8 - - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.9 Focal aarch64" os: linux arch: arm64 env: - MB_PYTHON_VERSION=3.9 - - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - name: "3.10 Focal aarch64" os: linux arch: arm64 env: - MB_PYTHON_VERSION=3.10 - - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} before_install: - source multibuild/common_utils.sh From cf7fff47bf9ccb10e2c1c3de27e00f93ca931b2f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Apr 2022 15:58:48 +1000 Subject: [PATCH 4/6] BUILD_DEPENDS is empty by default --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f3c757708..9fbd80c65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ env: - BUILD_COMMIT=HEAD - PLAT=aarch64 - UNICODE_WIDTH=32 - - BUILD_DEPENDS="" - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - TEST_DEPENDS="pytest pytest-timeout" From 00f66243380055fd3da671c876f24af59d5fb1ba Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Apr 2022 15:59:10 +1000 Subject: [PATCH 5/6] UNICODE_WIDTH is 32 by default --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9fbd80c65..1db739b2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ env: - REPO_DIR=Pillow - BUILD_COMMIT=HEAD - PLAT=aarch64 - - UNICODE_WIDTH=32 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} - TEST_DEPENDS="pytest pytest-timeout" From d006407c6672d1281ddf6f84f626def3bec76215 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Apr 2022 15:06:44 +1000 Subject: [PATCH 6/6] Removed unnecessary arguments to multibuild functions --- .github/workflows/build.sh | 6 +++--- .travis.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index f5cf261d1..585fdf17a 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -29,13 +29,13 @@ echo "::group::Install a virtualenv" echo "::endgroup::" echo "::group::Build wheel" - clean_code $REPO_DIR $BUILD_COMMIT - build_wheel $REPO_DIR $PLAT + clean_code + build_wheel ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/" echo "::endgroup::" if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then echo "::group::Test wheel" - install_run $PLAT + install_run echo "::endgroup::" fi diff --git a/.travis.yml b/.travis.yml index 1db739b2f..6dc81ecbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,12 +41,12 @@ before_install: install: # Maybe get and clean and patch source - - clean_code $REPO_DIR $BUILD_COMMIT - - build_wheel $REPO_DIR $PLAT + - clean_code + - build_wheel - ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/" script: - - install_run $PLAT + - install_run # Upload wheels to GitHub Releases deploy: