Skip to content

Commit d16c00f

Browse files
authored
Remove manylinux2014 and Amazon Linux 2 (#9528)
2 parents 7d78ac5 + 4dc9398 commit d16c00f

File tree

4 files changed

+10
-21
lines changed

4 files changed

+10
-21
lines changed

.github/workflows/test-docker.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
ubuntu-24.04-noble-s390x,
4444
# Then run the remainder
4545
alpine,
46-
amazon-2-amd64,
4746
amazon-2023-amd64,
4847
arch,
4948
centos-stream-9-amd64,

.github/workflows/wheels-dependencies.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ function build_libavif {
178178
build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03
179179
fi
180180

181-
local build_type=MinSizeRel
182181
local build_shared=ON
183182
local lto=ON
184183

@@ -195,9 +194,6 @@ function build_libavif {
195194
build_shared=OFF
196195
fi
197196
else
198-
if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "x86_64" ]]; then
199-
build_type=Release
200-
fi
201197
libavif_cmake_flags=(-DCMAKE_SHARED_LINKER_FLAGS_INIT="-Wl,--strip-all,-z,relro,-z,now")
202198
fi
203199
if [[ -n "$IOS_SDK" ]] && [[ "$PLAT" == "x86_64" ]]; then
@@ -226,7 +222,7 @@ function build_libavif {
226222
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$lto \
227223
-DCMAKE_C_VISIBILITY_PRESET=hidden \
228224
-DCMAKE_CXX_VISIBILITY_PRESET=hidden \
229-
-DCMAKE_BUILD_TYPE=$build_type \
225+
-DCMAKE_BUILD_TYPE=MinSizeRel \
230226
"${libavif_cmake_flags[@]}" \
231227
$HOST_CMAKE_FLAGS . )
232228

.github/workflows/wheels.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ concurrency:
3939
cancel-in-progress: true
4040

4141
env:
42-
EXPECTED_DISTS: 91
42+
EXPECTED_DISTS: 75
4343
FORCE_COLOR: 1
4444

4545
jobs:
@@ -74,26 +74,26 @@ jobs:
7474
os: macos-latest
7575
cibw_arch: arm64
7676
macosx_deployment_target: "11.0"
77-
- name: "manylinux2014 and musllinux x86_64"
77+
- name: "manylinux_2_28 x86_64"
7878
platform: linux
7979
os: ubuntu-latest
8080
cibw_arch: x86_64
81-
manylinux: "manylinux2014"
82-
- name: "manylinux_2_28 x86_64"
81+
build: "*manylinux*"
82+
- name: "musllinux x86_64"
8383
platform: linux
8484
os: ubuntu-latest
8585
cibw_arch: x86_64
86-
build: "*manylinux*"
87-
- name: "manylinux2014 and musllinux aarch64"
86+
build: "*musllinux*"
87+
- name: "manylinux_2_28 aarch64"
8888
platform: linux
8989
os: ubuntu-24.04-arm
9090
cibw_arch: aarch64
91-
manylinux: "manylinux2014"
92-
- name: "manylinux_2_28 aarch64"
91+
build: "*manylinux*"
92+
- name: "musllinux aarch64"
9393
platform: linux
9494
os: ubuntu-24.04-arm
9595
cibw_arch: aarch64
96-
build: "*manylinux*"
96+
build: "*musllinux*"
9797
- name: "iOS arm64 device"
9898
platform: ios
9999
os: macos-latest
@@ -128,10 +128,6 @@ jobs:
128128
CIBW_ARCHS: ${{ matrix.cibw_arch }}
129129
CIBW_BUILD: ${{ matrix.build }}
130130
CIBW_ENABLE: cpython-prerelease cpython-freethreading pypy
131-
CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }}
132-
CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.manylinux }}
133-
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
134-
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
135131
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
136132

137133
- uses: actions/upload-artifact@v6

docs/installation/platform-support.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ These platforms are built and tested for every change.
1919
+==================================+============================+=====================+
2020
| Alpine | 3.12 | x86-64 |
2121
+----------------------------------+----------------------------+---------------------+
22-
| Amazon Linux 2 | 3.10 | x86-64 |
23-
+----------------------------------+----------------------------+---------------------+
2422
| Amazon Linux 2023 | 3.11 | x86-64 |
2523
+----------------------------------+----------------------------+---------------------+
2624
| Arch | 3.14 | x86-64 |

0 commit comments

Comments
 (0)