Skip to content

Commit 50ff7bc

Browse files
committed
CI&CD: fixed sdist build
1 parent 6b4f270 commit 50ff7bc

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/wheels-pi_heif.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-*"
7575
CIBW_ARCHS_WINDOWS: "AMD64"
7676
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -vv -w {dest_dir} {wheel} --add-path ${{ env.MSYS2_PREFIX }}/bin"
77-
CIBW_ENVIRONMENT_WINDOWS: PH_LIGHT_ACTION=1
77+
CIBW_ENVIRONMENT_WINDOWS: PH_LIGHT_ACTION=1 TEST_DECODE_THREADS=0
7878

7979
- name: Checking built wheels
8080
run: |
@@ -193,8 +193,7 @@ jobs:
193193
matrix:
194194
cibw_buildlinux: [ manylinux ]
195195
cibw_arch: [ "aarch64", "i686", "x86_64" ]
196-
cibw_build: [ "pp38", "pp39" ]
197-
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • ${{ matrix.cibw_build }}
196+
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • PyPy
198197
runs-on: ubuntu-20.04
199198
env:
200199
BUILD_DIR: "/tmp/ph_build_stuff"
@@ -230,7 +229,7 @@ jobs:
230229
python3 -m pip install cibuildwheel==2.11.4
231230
python3 -m cibuildwheel
232231
env:
233-
CIBW_BUILD: ${{ format('{0}-{1}_{2}', matrix.cibw_build , matrix.cibw_buildlinux, matrix.cibw_arch) }}
232+
CIBW_BUILD: ${{ format('pp3*-{0}_{1}', matrix.cibw_buildlinux, matrix.cibw_arch) }}
234233
CIBW_ARCHS: ${{ matrix.cibw_arch }}
235234
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y libjpeg-turbo-devel lcms2-devel"
236235
CIBW_ENVIRONMENT_LINUX: BUILD_DIR=/host${{ env.BUILD_DIR }} PH_LIGHT_ACTION=1
@@ -325,7 +324,7 @@ jobs:
325324
326325
- name: Install libheif from formula
327326
run: |
328-
brew uninstall --force --ignore-dependencies imagemagick x265 aom
327+
brew uninstall --force --ignore-dependencies imagemagick libheif x265 aom
329328
brew install --formula ./libheif/macos/libheif.rb
330329
331330
- name: Install requirements

.github/workflows/wheels-pillow_heif.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ jobs:
238238
matrix:
239239
cibw_buildlinux: [ manylinux ]
240240
cibw_arch: [ "aarch64", "x86_64" ]
241-
cibw_build: [ "pp38", "pp39" ]
242-
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • ${{ matrix.cibw_build }}
241+
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • PyPy
243242
runs-on: ubuntu-20.04
244243
env:
245244
BUILD_DIR: "/tmp/ph_build_stuff"
@@ -270,7 +269,7 @@ jobs:
270269
python3 -m pip install cibuildwheel==2.11.4
271270
python3 -m cibuildwheel
272271
env:
273-
CIBW_BUILD: ${{ format('{0}-{1}_{2}', matrix.cibw_build , matrix.cibw_buildlinux, matrix.cibw_arch) }}
272+
CIBW_BUILD: ${{ format('pp3*-{0}_{1}', matrix.cibw_buildlinux, matrix.cibw_arch) }}
274273
CIBW_ARCHS: ${{ matrix.cibw_arch }}
275274
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y libjpeg-turbo-devel lcms2-devel"
276275
CIBW_ENVIRONMENT_LINUX: BUILD_DIR=/host${{ env.BUILD_DIR }} PH_FULL_ACTION=1
@@ -304,7 +303,7 @@ jobs:
304303

305304
- name: Install libheif from formula
306305
run: |
307-
brew uninstall --force --ignore-dependencies imagemagick
306+
brew uninstall --force --ignore-dependencies imagemagick libheif
308307
brew install --formula ./libheif/macos/libheif.rb
309308
310309
- name: Build sdist

0 commit comments

Comments
 (0)