Skip to content
This repository has been archived by the owner on Oct 8, 2024. It is now read-only.

Used QEMU to move Travis CI jobs to GitHub Actions #247

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ pull_request_rules:
- "#approved-reviews-by>=1"
- label=automerge
- status-success=Lint
- status-success=Travis CI - Pull Request
- status-success=Wheels Successful
actions:
merge:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@

if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$OS_NAME" == "osx" ]]; then
# webp, zstd, xz, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb
# curl from brew requires zstd, use system curl
# if php is installed, brew tries to reinstall these after installing openblas
brew remove --ignore-dependencies webp zstd xz libtiff libxcb curl php
fi

if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
if [[ "$PLAT" == "aarch64" ]]; then
DOCKER_TEST_IMAGE="multibuild/focal_{PLAT}"
elif [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
MB_PYTHON_OSX_VER="10.9"
if [[ "$PLAT" == "i686" ]]; then
DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
Expand All @@ -15,6 +17,10 @@ if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
fi
fi

if [[ "$PLAT" == "aarch64" ]]; then
docker run --rm --privileged aptman/qus -s -- -p $PLAT
fi

echo "::group::Install a virtualenv"
source multibuild/common_utils.sh
source multibuild/travis_steps.sh
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@ env:

jobs:
build:
name: ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
name: ${{ matrix.platform }} ${{ matrix.os-name }} ${{ matrix.python }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
platform: [ "aarch64", "x86_64", "i686" ]
os: [ "ubuntu-20.04", "macos-latest" ]
python: [ "pypy3.7-7.3.7", "3.7", "3.8", "3.9", "3.10" ]
platform: [ "x86_64", "i686" ]
macos-target: [ "10.10" ]
exclude:
- os: "macos-latest"
platform: "i686"
- os: "macos-latest"
platform: "aarch64"
include:
- os: "macos-latest"
os-name: "osx"
Expand All @@ -47,7 +49,7 @@ jobs:
BUILD_COMMIT: HEAD
PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }}
TRAVIS_OS_NAME: ${{ matrix.os-name }}
OS_NAME: ${{ matrix.os-name }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps:
- uses: actions/checkout@v2
Expand All @@ -68,19 +70,21 @@ jobs:
# uses: mxschmitt/action-tmate@v3

build-latest:
name: ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} latest
name: ${{ matrix.platform }} ${{ matrix.os-name }} ${{ matrix.python }} latest
runs-on: ${{ matrix.os }}
if: "!startsWith(github.ref, 'refs/tags/')"
strategy:
fail-fast: false
matrix:
platform: [ "aarch64", "x86_64", "i686" ]
os: [ "ubuntu-20.04", "macos-latest" ]
python: [ "pypy3.7-7.3.7", "3.7", "3.8", "3.9", "3.10" ]
platform: [ "x86_64", "i686" ]
macos-target: [ "10.10" ]
exclude:
- os: "macos-latest"
platform: "i686"
- os: "macos-latest"
platform: "aarch64"
include:
- os: "macos-latest"
os-name: "osx"
Expand All @@ -105,7 +109,7 @@ jobs:
BUILD_COMMIT: main
PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }}
TRAVIS_OS_NAME: ${{ matrix.os-name }}
OS_NAME: ${{ matrix.os-name }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps:
- uses: actions/checkout@v2
Expand Down
70 changes: 0 additions & 70 deletions .travis.yml

This file was deleted.

6 changes: 1 addition & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ This repository creates wheels for tagged versions of Pillow::
:target: https://github.com/python-pillow/pillow-wheels/actions/workflows/wheels.yml
:alt: GitHub Actions build status (Wheels)

.. image:: https://img.shields.io/travis/com/python-pillow/pillow-wheels/main.svg
:target: https://app.travis-ci.com/github/python-pillow/pillow-wheels
:alt: Travis CI build status

Archives
--------

Expand Down Expand Up @@ -49,7 +45,7 @@ Wheels
------

Wheels are uploaded to https://github.com/python-pillow/pillow-wheels/releases.
Credentials for this specific repo are stored in a Travis CI secret, so the upload
Credentials for this specific repo are stored in a GitHub secret, so the upload
won't work from another repository.

PyPI
Expand Down