Skip to content

Commit dd0ebb0

Browse files
bigcat88bigcat88
committed
actions clearing, update
1 parent 3de2ea7 commit dd0ebb0

File tree

5 files changed

+17
-51
lines changed

5 files changed

+17
-51
lines changed

‎.github/workflows/build-cache-deps.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,11 @@ jobs:
3939
- name: Install cibuildwheel & twine
4040
run: python3 -m pip install cibuildwheel twine
4141

42-
- name: manylinux preparations
43-
if: matrix.cibw_buildlinux == 'manylinux'
44-
run: echo INSTALL_OS_PACKAGES="yum makecache && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
45-
env:
46-
OS_PACKAGES: "git-all"
47-
48-
- name: musllinux preparations
49-
if: matrix.cibw_buildlinux == 'musllinux'
42+
- name: 32-bit musllinux preparations
43+
if: matrix.cibw_buildlinux == 'musllinux' && matrix.cibw_arch == 'i686'
5044
run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
5145
env:
52-
OS_PACKAGES: "sudo py3-pip python3-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
46+
OS_PACKAGES: "fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
5347

5448
- uses: actions/cache@v3
5549
with:

‎.github/workflows/publish-pypi-pi_heif.yml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v3
17-
1817
- name: Transform to Pi-Heif
1918
run: |
2019
cp -r -v -force ./pi-heif/* .
@@ -66,7 +65,6 @@ jobs:
6665

6766
steps:
6867
- uses: actions/checkout@v3
69-
7068
- name: Transform to Pi-Heif
7169
run: |
7270
cp -r -v ./pi-heif/* .
@@ -106,7 +104,6 @@ jobs:
106104

107105
steps:
108106
- uses: actions/checkout@v3
109-
110107
- name: Transform to Pi-Heif
111108
run: |
112109
cp -r -v ./pi-heif/* .
@@ -118,17 +115,11 @@ jobs:
118115
with:
119116
platforms: arm64
120117

121-
- name: manylinux preparations
122-
if: matrix.cibw_buildlinux == 'manylinux'
123-
run: echo INSTALL_OS_PACKAGES="yum makecache && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
124-
env:
125-
OS_PACKAGES: "git-all libjpeg-turbo-devel lcms2-devel libffi-devel"
126-
127118
- name: musllinux preparations
128119
if: matrix.cibw_buildlinux == 'musllinux'
129120
run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
130121
env:
131-
OS_PACKAGES: "sudo py3-pip python3-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
122+
OS_PACKAGES: "fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
132123

133124
- name: Run cibuildwheel
134125
run: |
@@ -158,7 +149,7 @@ jobs:
158149
matrix:
159150
cibw_buildlinux: [ manylinux ]
160151
cibw_arch: [ "aarch64", "i686", "x86_64" ]
161-
cibw_build: [ "pp37", "pp38" ]
152+
cibw_build: [ "pp38", "pp39" ]
162153
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • ${{ matrix.cibw_build }}
163154
runs-on: ubuntu-20.04
164155
env:
@@ -167,7 +158,6 @@ jobs:
167158

168159
steps:
169160
- uses: actions/checkout@v3
170-
171161
- name: Transform to Pi-Heif
172162
run: |
173163
cp -r -v ./pi-heif/* .
@@ -186,7 +176,7 @@ jobs:
186176
env:
187177
CIBW_BUILD: ${{ format('{0}-{1}_{2}', matrix.cibw_build , matrix.cibw_buildlinux, matrix.cibw_arch) }}
188178
CIBW_ARCHS: ${{ matrix.cibw_arch }}
189-
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y git-all libjpeg-turbo-devel lcms2-devel libffi-devel"
179+
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y libjpeg-turbo-devel lcms2-devel"
190180
CIBW_ENVIRONMENT_LINUX: BUILD_DIR_PREFIX=/host${{ env.BUILD_DIR_PREFIX }} PH_LIGHT_ACTION=1
191181

192182
- name: Checking built wheels
@@ -213,7 +203,6 @@ jobs:
213203

214204
steps:
215205
- uses: actions/checkout@v3
216-
217206
- name: Transform to Pi-Heif
218207
run: |
219208
cp -r -v ./pi-heif/* .
@@ -250,7 +239,6 @@ jobs:
250239

251240
steps:
252241
- uses: actions/checkout@v3
253-
254242
- name: Transform to Pi-Heif
255243
run: |
256244
cp -r -v ./pi-heif/* .
@@ -285,7 +273,7 @@ jobs:
285273

286274
- name: Test sdist
287275
run: |
288-
export PH_LIGHT_ACTION=1
276+
export PH_LIGHT_ACTION=1 TEST_DECODE_THREADS=0
289277
python3 -m pytest -rs
290278
291279
- name: Upload sdist

‎.github/workflows/publish-pypi.yml‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v3
20-
2120
- name: Set up QEMU
2221
uses: docker/setup-qemu-action@v2
2322

@@ -51,7 +50,6 @@ jobs:
5150

5251
steps:
5352
- uses: actions/checkout@v3
54-
5553
- uses: msys2/setup-msys2@v2
5654
with:
5755
location: C:/temp
@@ -138,17 +136,11 @@ jobs:
138136
with:
139137
platforms: arm64
140138

141-
- name: manylinux preparations
142-
if: matrix.cibw_buildlinux == 'manylinux'
143-
run: echo INSTALL_OS_PACKAGES="yum makecache && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
144-
env:
145-
OS_PACKAGES: "git-all libjpeg-turbo-devel lcms2-devel libffi-devel"
146-
147139
- name: musllinux preparations
148140
if: matrix.cibw_buildlinux == 'musllinux'
149141
run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
150142
env:
151-
OS_PACKAGES: "sudo py3-pip python3-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
143+
OS_PACKAGES: "fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
152144

153145
- name: Only minimal testing on aarch64
154146
if: matrix.cibw_arch == 'aarch64'
@@ -207,17 +199,11 @@ jobs:
207199
with:
208200
platforms: arm64
209201

210-
- name: manylinux preparations
211-
if: matrix.cibw_buildlinux == 'manylinux'
212-
run: echo INSTALL_OS_PACKAGES="yum makecache && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
213-
env:
214-
OS_PACKAGES: "git-all libjpeg-turbo-devel lcms2-devel libffi-devel"
215-
216202
- name: musllinux preparations
217203
if: matrix.cibw_buildlinux == 'musllinux'
218204
run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
219205
env:
220-
OS_PACKAGES: "sudo py3-pip python3-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
206+
OS_PACKAGES: "fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
221207

222208
- name: Only minimal testing on aarch64
223209
if: matrix.cibw_arch == 'aarch64'
@@ -262,7 +248,7 @@ jobs:
262248
matrix:
263249
cibw_buildlinux: [ manylinux ]
264250
cibw_arch: [ "aarch64", "x86_64" ]
265-
cibw_build: [ "pp37", "pp38" ]
251+
cibw_build: [ "pp38", "pp39" ]
266252
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • ${{ matrix.cibw_build }}
267253
runs-on: ubuntu-20.04
268254
env:
@@ -296,7 +282,7 @@ jobs:
296282
env:
297283
CIBW_BUILD: ${{ format('{0}-{1}_{2}', matrix.cibw_build , matrix.cibw_buildlinux, matrix.cibw_arch) }}
298284
CIBW_ARCHS: ${{ matrix.cibw_arch }}
299-
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y git-all libjpeg-turbo-devel lcms2-devel libffi-devel"
285+
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y libjpeg-turbo-devel lcms2-devel"
300286
CIBW_ENVIRONMENT_LINUX: BUILD_DIR_PREFIX=/host${{ env.BUILD_DIR_PREFIX }} PH_FULL_ACTION=1
301287

302288
- name: Checking built wheels
@@ -320,7 +306,7 @@ jobs:
320306
matrix:
321307
cibw_buildlinux: [ manylinux ]
322308
cibw_arch: [ "i686" ]
323-
cibw_build: [ "pp37", "pp38" ]
309+
cibw_build: [ "pp38", "pp39" ]
324310
name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • ${{ matrix.cibw_build }}
325311
runs-on: ubuntu-20.04
326312
env:
@@ -354,7 +340,6 @@ jobs:
354340
env:
355341
CIBW_BUILD: ${{ format('{0}-{1}_{2}', matrix.cibw_build , matrix.cibw_buildlinux, matrix.cibw_arch) }}
356342
CIBW_ARCHS: ${{ matrix.cibw_arch }}
357-
CIBW_BEFORE_ALL_LINUX: "yum makecache && yum install -y git-all libjpeg-turbo-devel lcms2-devel libffi-devel"
358343
CIBW_ENVIRONMENT_LINUX: BUILD_DIR_PREFIX=/host${{ env.BUILD_DIR_PREFIX }} PH_LIGHT_ACTION=1
359344

360345
- name: Checking built wheels
@@ -378,7 +363,6 @@ jobs:
378363

379364
steps:
380365
- uses: actions/checkout@v3
381-
382366
- uses: actions/setup-python@v4
383367
with:
384368
python-version: '3.10'
@@ -409,7 +393,7 @@ jobs:
409393

410394
- name: Test sdist
411395
run: |
412-
export PH_FULL_ACTION=1
396+
export PH_FULL_ACTION=1 TEST_DECODE_THREADS=0
413397
python3 -m pytest -rs
414398
415399
- name: Upload sdist

‎.github/workflows/test-wheels-pi_heif.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: macos-11
111111
strategy:
112112
matrix:
113-
python-version: ["pypy-3.7", "pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
113+
python-version: ["pypy-3.8", "pypy-3.9", "3.7", "3.8", "3.9", "3.10", "3.11"]
114114

115115
steps:
116116
- name: Delay, waiting Pypi to update.
@@ -146,7 +146,7 @@ jobs:
146146
runs-on: ubuntu-20.04
147147
strategy:
148148
matrix:
149-
python-version: ["pypy-3.7", "pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
149+
python-version: ["pypy-3.8", "pypy-3.9", "3.7", "3.8", "3.9", "3.10", "3.11"]
150150

151151
steps:
152152
- name: Delay, waiting Pypi to update.

‎.github/workflows/test-wheels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
runs-on: macos-11
116116
strategy:
117117
matrix:
118-
python-version: ["pypy-3.7", "pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
118+
python-version: ["pypy-3.8", "pypy-3.9", "3.7", "3.8", "3.9", "3.10", "3.11"]
119119

120120
steps:
121121
- name: Delay, waiting Pypi to update.
@@ -150,7 +150,7 @@ jobs:
150150
runs-on: ubuntu-20.04
151151
strategy:
152152
matrix:
153-
python-version: ["pypy-3.7", "pypy-3.8", "3.7", "3.8", "3.9", "3.10", "3.11"]
153+
python-version: ["pypy-3.8", "pypy-3.9", "3.7", "3.8", "3.9", "3.10", "3.11"]
154154

155155
steps:
156156
- name: Delay, waiting Pypi to update.

0 commit comments

Comments
 (0)