Skip to content

Commit 3d7048e

Browse files
committed
Updates
1 parent bbe5ca9 commit 3d7048e

File tree

2 files changed

+15
-52
lines changed

2 files changed

+15
-52
lines changed

.github/workflows/wheels.yml

Lines changed: 14 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ jobs:
66
build_wheels:
77
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
88
runs-on: ${{ matrix.os }}
9+
env:
10+
# OpenSSL version control
11+
OPENSSL_VERSION: "openssl-3.5.2"
12+
# SWIG version control
13+
SWIG_VERSION: "4.3.1"
914
strategy:
1015
fail-fast: false
1116
matrix:
1217
include:
1318
# Windows 32-bit
14-
- os: windows-2022
15-
python: 37
16-
platform_id: win32
17-
- os: windows-2022
18-
python: 38
19-
platform_id: win32
2019
- os: windows-2022
2120
python: 39
2221
platform_id: win32
@@ -31,12 +30,6 @@ jobs:
3130
platform_id: win32
3231

3332
# Windows 64-bit
34-
- os: windows-2022
35-
python: 37
36-
platform_id: win_amd64
37-
- os: windows-2022
38-
python: 38
39-
platform_id: win_amd64
4033
- os: windows-2022
4134
python: 39
4235
platform_id: win_amd64
@@ -51,12 +44,6 @@ jobs:
5144
platform_id: win_amd64
5245

5346
# Linux 32-bit
54-
- os: ubuntu-latest
55-
python: 37
56-
platform_id: manylinux_i686
57-
- os: ubuntu-latest
58-
python: 38
59-
platform_id: manylinux_i686
6047
- os: ubuntu-latest
6148
python: 39
6249
platform_id: manylinux_i686
@@ -71,12 +58,6 @@ jobs:
7158
platform_id: manylinux_i686
7259

7360
# Linux 64-bit
74-
- os: ubuntu-latest
75-
python: 37
76-
platform_id: manylinux_x86_64
77-
- os: ubuntu-latest
78-
python: 38
79-
platform_id: manylinux_x86_64
8061
- os: ubuntu-latest
8162
python: 39
8263
platform_id: manylinux_x86_64
@@ -91,12 +72,6 @@ jobs:
9172
platform_id: manylinux_x86_64
9273

9374
# Linux aarch64
94-
- os: ubuntu-latest
95-
python: 37
96-
platform_id: manylinux_aarch64
97-
- os: ubuntu-latest
98-
python: 38
99-
platform_id: manylinux_aarch64
10075
- os: ubuntu-latest
10176
python: 39
10277
platform_id: manylinux_aarch64
@@ -111,14 +86,6 @@ jobs:
11186
platform_id: manylinux_aarch64
11287

11388
# macOS on Intel 64-bit
114-
- os: macos-latest
115-
python: 37
116-
arch: x86_64
117-
platform_id: macosx_x86_64
118-
- os: macos-latest
119-
python: 38
120-
arch: x86_64
121-
platform_id: macosx_x86_64
12289
- os: macos-latest
12390
python: 39
12491
arch: x86_64
@@ -137,10 +104,6 @@ jobs:
137104
platform_id: macosx_x86_64
138105

139106
# macOS on Apple M1 64-bit
140-
- os: macos-latest
141-
python: 38
142-
arch: arm64
143-
platform_id: macosx_arm64
144107
- os: macos-latest
145108
python: 39
146109
arch: arm64
@@ -214,7 +177,7 @@ jobs:
214177
pushd c:/
215178
git clone https://github.com/openssl/openssl.git
216179
pushd openssl
217-
git checkout openssl-3.3.0
180+
git checkout ${{ env.OPENSSL_VERSION }}
218181
perl Configure no-shared no-tests VC-WIN64A
219182
nmake
220183
mkdir lib\VC
@@ -229,7 +192,7 @@ jobs:
229192
pushd c:\
230193
git clone https://github.com/openssl/openssl.git
231194
pushd openssl
232-
git checkout openssl-3.3.0
195+
git checkout ${{ env.OPENSSL_VERSION }}
233196
perl Configure no-shared no-tests VC-WIN32
234197
nmake
235198
mkdir lib\VC
@@ -244,7 +207,7 @@ jobs:
244207
pushd /tmp
245208
git clone https://github.com/openssl/openssl.git
246209
pushd openssl
247-
git checkout openssl-3.3.0
210+
git checkout ${{ env.OPENSSL_VERSION }}
248211
./Configure --prefix=/usr/local/openssl no-tests darwin64-${{ matrix.arch }}-cc
249212
make
250213
sudo make install
@@ -263,9 +226,9 @@ jobs:
263226
- name: Build wheels
264227
# to supply options, put them in 'env', like:
265228
env:
266-
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
267-
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
268-
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
229+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
230+
CIBW_MANYLINUX_I686_IMAGE: manylinux_2_28
231+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
269232
CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
270233
CIBW_ARCHS_LINUX: auto aarch64
271234

@@ -276,10 +239,10 @@ jobs:
276239

277240
CIBW_BEFORE_ALL_LINUX: |
278241
yum install -y gcc-c++ pcre-devel openssl-devel
279-
/opt/python/cp38-cp38/bin/python -m pip install ninja
280-
ln -s /opt/python/cp38-cp38/bin/ninja /usr/bin/ninja
242+
/opt/python/cp39-cp39/bin/python -m pip install ninja
243+
ln -s /opt/python/cp39-cp39/bin/ninja /usr/bin/ninja
281244
if [[ ! -e $(command -v swig) ]]; then
282-
curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.2.1/swig-4.2.1.tar.gz/download --output /tmp/swig.tar.gz
245+
curl -L https://sourceforge.net/projects/swig/files/swig/swig-${{ env.SWIG_VERSION }}/swig-${{ env.SWIG_VERSION }}.tar.gz/download --output /tmp/swig.tar.gz
283246
mkdir /tmp/swig
284247
tar -xvzf /tmp/swig.tar.gz -C /tmp/swig --strip-components 1 &> /dev/null
285248
pushd /tmp/swig

0 commit comments

Comments
 (0)