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.

Sign up for GitHub

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

Jump to bottom

Update manylinux builds to use Ubuntu 24.04 #206

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Update manylinux builds to use Ubuntu 24.04 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
- "manylinux_2_28-wheel-build"
include:
- image: "manylinux2014-wheel-build"
test-image: "ubuntu-22.04-jammy-amd64"
test-image: "ubuntu-24.04-noble-amd64"
- image: "manylinux_2_28-wheel-build"
test-image: "ubuntu-22.04-jammy-amd64"
test-image: "ubuntu-24.04-noble-amd64"
- image: "ubuntu-22.04-jammy-arm64v8"
qemu-arch: "aarch64"
- image: "ubuntu-24.04-noble-ppc64le"
Expand Down
6 changes: 3 additions & 3 deletions manylinux2014-wheel-build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET := $(notdir $(WD))
ROOT := $(abspath $(WD)/../Pillow)
IMAGENAME := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TARGET), $(TARGET))
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
TEST_TARGET = ubuntu-22.04-jammy-amd64
TEST_TARGET = ubuntu-24.04-noble-amd64
TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TEST_TARGET):$(BRANCH), pythonpillow/$(TEST_TARGET):main)

.PHONY: build
Expand Down Expand Up @@ -32,8 +32,8 @@ wheel:
_PYVER=312 $(MAKE) wheel

.PHONY: test
test: 310
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx"
test: 312
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx"

.PHONY: push
push:
Expand Down
2 changes: 1 addition & 1 deletion manylinux2014-wheel-build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ symbols for debugging with Valgrind/GDB.

The Makefile has several new commands:

* make wheel: Makes a Python 3.10 manylinux2014 wheel, and puts it in the
* make wheel: Makes a Python 3.12 manylinux2014 wheel, and puts it in the
./out directory.
* make 38|39|310|311|312: These are specific commands to make
the corresponding 3.x version in the ./out directory.
Expand Down
4 changes: 2 additions & 2 deletions manylinux2014-wheel-build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ fi
# not strictly necessary, unless running multiple versions from the shell
rm -f /tmp/*.whl || true

# Python version, as 38,39,310,311,312. Defaults to 310.
# Python version, as 38,39,310,311,312. Defaults to 312.
# Matches the naming in /opt/python/
PYVER=${1:-310}
PYVER=${1:-312}
PYBIN=$(echo /opt/python/cp${PYVER}*/bin)

# We have to clean up the Pillow directories, otherwise we might get
Expand Down
6 changes: 3 additions & 3 deletions manylinux_2_28-wheel-build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET := $(notdir $(WD))
ROOT := $(abspath $(WD)/../Pillow)
IMAGENAME := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TARGET), $(TARGET))
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
TEST_TARGET = ubuntu-22.04-jammy-amd64
TEST_TARGET = ubuntu-24.04-noble-amd64
TEST_IMAGE := $(if $(DOCKER_USERNAME), $(DOCKER_USERNAME)/$(TEST_TARGET):$(BRANCH), pythonpillow/$(TEST_TARGET):main)

.PHONY: build
Expand Down Expand Up @@ -32,8 +32,8 @@ wheel:
_PYVER=312 $(MAKE) wheel

.PHONY: test
test: 310
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp310-manylinux_2_28_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx"
test: 312
docker run --rm -v $(ROOT):/Pillow -v `pwd`/out:/output $(TEST_IMAGE) sh -c "/vpy3/bin/pip install /output/*cp312-manylinux_2_28_x86_64.whl && cd /Pillow && /vpy3/bin/python selftest.py && /usr/bin/xvfb-run -a /vpy3/bin/pytest -vx"

.PHONY: push
push:
Expand Down
2 changes: 1 addition & 1 deletion manylinux_2_28-wheel-build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ symbols for debugging with Valgrind/GDB.

The Makefile has several new commands:

* make wheel: Makes a Python 3.10 manylinux_2_28 wheel, and puts it in the
* make wheel: Makes a Python 3.12 manylinux_2_28 wheel, and puts it in the
./out directory.
* make 38|39|310|311|312: These are specific commands to make
the corresponding 3.x version in the ./out directory.
Expand Down
4 changes: 2 additions & 2 deletions manylinux_2_28-wheel-build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ fi
# not strictly necessary, unless running multiple versions from the shell
rm -f /tmp/*.whl || true

# Python version, as 38,39,310,311,312. Defaults to 310.
# Python version, as 38,39,310,311,312. Defaults to 312.
# Matches the naming in /opt/python/
PYVER=${1:-310}
PYVER=${1:-312}
PYBIN=$(echo /opt/python/cp${PYVER}*/bin)

# We have to clean up the Pillow directories, otherwise we might get
Expand Down