Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Used QEMU to move Travis CI jobs to GHA #367

Closed
wants to merge 7 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
6 changes: 5 additions & 1 deletion .github/workflows/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$OS_NAME" == "osx" ]]; then
# webp, zstd, xz, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb
# libxdmcp causes an issue on macOS < 11
# curl from brew requires zstd, use system curl
Expand All @@ -20,6 +20,10 @@ if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
MB_PYTHON_OSX_VER="10.9"
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
29 changes: 13 additions & 16 deletions .github/workflows/wheels-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
build:
name: ${{ matrix.python }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }}
name: ${{ matrix.platform }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }} ${{ matrix.python }}
runs-on: "ubuntu-latest"
strategy:
fail-fast: false
Expand All @@ -30,26 +30,23 @@ jobs:
"3.11",
"3.12",
]
mb-ml-libc: [ "manylinux" ]
mb-ml-ver: [ 2014, "_2_28" ]
include:
- python: "3.8"
platform: [ "aarch64", "x86_64" ]
mb-ml-libc: [ "manylinux", "musllinux" ]
mb-ml-ver: [ 2014, "_1_1", "_2_28" ]
exclude:
- python: "pypy3.9-7.3.12"
mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
- python: "3.9"
mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
- python: "3.10"
mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
- python: "3.11"
mb-ml-libc: "musllinux"
mb-ml-ver: "_1_1"
- python: "3.12"
- python: "pypy3.10-7.3.12"
mb-ml-libc: "musllinux"
- mb-ml-libc: "musllinux"
mb-ml-ver: 2014
- mb-ml-libc: "manylinux"
mb-ml-ver: "_1_1"
- mb-ml-libc: "musllinux"
mb-ml-ver: "_2_28"
env:
BUILD_COMMIT: ${{ inputs.build-commit }}
PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }}
MB_ML_LIBC: ${{ matrix.mb-ml-libc }}
MB_ML_VER: ${{ matrix.mb-ml-ver }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
build:
name: ${{ matrix.python }} ${{ matrix.platform }}
name: ${{ matrix.platform }} ${{ matrix.python }}
runs-on: "macos-latest"
strategy:
fail-fast: false
Expand All @@ -40,7 +40,7 @@ jobs:
BUILD_COMMIT: ${{ inputs.build-commit }}
PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }}
TRAVIS_OS_NAME: "osx"
OS_NAME: "osx"
steps:
- uses: actions/checkout@v3
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@ concurrency:
cancel-in-progress: true

jobs:
macos:
uses: ./.github/workflows/wheels-macos.yml
linux:
uses: ./.github/workflows/wheels-linux.yml
with:
build-commit: "HEAD"
artifacts-name: "wheels"

linux:
uses: ./.github/workflows/wheels-linux.yml
macos:
uses: ./.github/workflows/wheels-macos.yml
with:
build-commit: "HEAD"
artifacts-name: "wheels"

macos-latest:
linux-latest:
if: "!startsWith(github.ref, 'refs/tags/')"
uses: ./.github/workflows/wheels-macos.yml
uses: ./.github/workflows/wheels-linux.yml
with:
build-commit: "main"
artifacts-name: "wheels-latest"

linux-latest:
macos-latest:
if: "!startsWith(github.ref, 'refs/tags/')"
uses: ./.github/workflows/wheels-linux.yml
uses: ./.github/workflows/wheels-macos.yml
with:
build-commit: "main"
artifacts-name: "wheels-latest"
Expand All @@ -49,7 +49,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

success:
needs: [macos, linux, macos-latest, linux-latest]
needs: [linux, macos, linux-latest, macos-latest]
runs-on: ubuntu-latest
name: Wheels Successful
steps:
Expand Down
135 changes: 0 additions & 135 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 All @@ -39,7 +35,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.

Windows wheels are not created here. Instead, they are
Expand Down