Merge pull request #287 from radarhere/clean

Cleanup code
This commit is contained in:
Hugo van Kemenade 2022-04-10 11:29:35 +03:00 committed by GitHub
commit e9bb5dd131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions

View File

@ -29,13 +29,13 @@ echo "::group::Install a virtualenv"
echo "::endgroup::" echo "::endgroup::"
echo "::group::Build wheel" echo "::group::Build wheel"
clean_code $REPO_DIR $BUILD_COMMIT clean_code
build_wheel $REPO_DIR $PLAT build_wheel
ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/" ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/"
echo "::endgroup::" echo "::endgroup::"
if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then
echo "::group::Test wheel" echo "::group::Test wheel"
install_run $PLAT install_run
echo "::endgroup::" echo "::endgroup::"
fi fi

View File

@ -2,9 +2,8 @@ env:
global: global:
- REPO_DIR=Pillow - REPO_DIR=Pillow
- BUILD_COMMIT=HEAD - BUILD_COMMIT=HEAD
- PLAT=x86_64 - PLAT=aarch64
- UNICODE_WIDTH=32 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
- BUILD_DEPENDS=""
- TEST_DEPENDS="pytest pytest-timeout" - TEST_DEPENDS="pytest pytest-timeout"
language: python language: python
@ -18,30 +17,22 @@ jobs:
- name: "3.7 Focal aarch64" - name: "3.7 Focal aarch64"
arch: arm64 arch: arm64
env: env:
- PLAT=aarch64
- MB_PYTHON_VERSION=3.7 - MB_PYTHON_VERSION=3.7
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
- name: "3.8 Focal aarch64" - name: "3.8 Focal aarch64"
os: linux os: linux
arch: arm64 arch: arm64
env: env:
- PLAT=aarch64
- MB_PYTHON_VERSION=3.8 - MB_PYTHON_VERSION=3.8
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
- name: "3.9 Focal aarch64" - name: "3.9 Focal aarch64"
os: linux os: linux
arch: arm64 arch: arm64
env: env:
- PLAT=aarch64
- MB_PYTHON_VERSION=3.9 - MB_PYTHON_VERSION=3.9
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
- name: "3.10 Focal aarch64" - name: "3.10 Focal aarch64"
os: linux os: linux
arch: arm64 arch: arm64
env: env:
- PLAT=aarch64
- MB_PYTHON_VERSION=3.10 - MB_PYTHON_VERSION=3.10
- DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
before_install: before_install:
- source multibuild/common_utils.sh - source multibuild/common_utils.sh
@ -50,13 +41,12 @@ before_install:
install: install:
# Maybe get and clean and patch source # Maybe get and clean and patch source
- if [[ -n "$LATEST" ]]; then BUILD_COMMIT=main; fi - clean_code
- clean_code $REPO_DIR $BUILD_COMMIT - build_wheel
- build_wheel $REPO_DIR $PLAT
- ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/" - ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/"
script: script:
- install_run $PLAT - install_run
# Upload wheels to GitHub Releases # Upload wheels to GitHub Releases
deploy: deploy:
@ -65,6 +55,5 @@ deploy:
file_glob: true file_glob: true
file: "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/*.whl" file: "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/*.whl"
on: on:
condition: -z "$LATEST"
repo: python-pillow/pillow-wheels repo: python-pillow/pillow-wheels
skip_cleanup: true skip_cleanup: true