Skip to content

Commit 0483ad6

Browse files
Force build wheel for cpython310 with system gcc
1 parent bc31552 commit 0483ad6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/Build_wheels_for_cpython310_x86_64_u24.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build wheels for CPython3.10 x86_64 on Ubuntu16 withb GCC-14
1+
name: Build wheels for CPython3.10 x86_64 on Ubuntu16 with GCC-5 and treat warnings as errors
22

33
on: [push, pull_request]
44

@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os:
17-
- name: Ubuntu 16 amd64 CPython 3.10
17+
- name: Ubuntu 24+16 amd64 CPython 3.10
1818
runs-on: ubuntu-latest
1919
matrix: linux
2020
arch: amd64
@@ -83,14 +83,14 @@ jobs:
8383
- name: Pepare dev files
8484
if: matrix.os.matrix == 'linux'
8585
run: |
86-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install --no-install-recommends -y libzstd-dev file gcc-14 binutils
86+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install --no-install-recommends -y libzstd-dev file
8787
8888
- name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
8989
if: matrix.os.matrix == 'linux'
9090
run: |
9191
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install -y ${{matrix.os.pypkg}}-dev gcc pkg-config ${{matrix.os.pypkgadd}}
9292
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "wget ${{matrix.os.getpipurl}} -O get-pip.py && ${{matrix.os.pypkg}} get-pip.py || true"
93-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools<72.0'"
93+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "${{matrix.os.pypkg}} -m pip install -U 'setuptools<72.0'"
9494
9595
- name: Pepare source and build wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
9696
if: matrix.os.matrix == 'linux'
@@ -99,9 +99,9 @@ jobs:
9999
version=`cat version`
100100
sudo tar -xvf dist/zstd-$version.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
101101
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env
102-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc-14.3 -v
102+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v
103103
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion
104-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ZSTD_ASM=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel"
104+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ZSTD_ASM=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ZSTD_WERRORS=1 CC=gcc CXX=g++ LD=ld ${{matrix.os.pypkg}} setup.py bdist_wheel"
105105
106106
- name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
107107
if: matrix.os.matrix == 'linux'

.github/workflows/Build_wheels_for_cpython310_x86_u16.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build wheels for CPython3.10 x86 on Ubuntu16 with GCC-14
1+
name: Build wheels for CPython3.10 x86 on Ubuntu16 with GCC-5 and treat warnings as errors
22

33
on: [push, pull_request]
44

@@ -82,7 +82,7 @@ jobs:
8282
- name: Pepare dev files
8383
if: matrix.os.matrix == 'linux'
8484
run: |
85-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install --no-install-recommends -y libzstd-dev gcc-14 file binutils
85+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /usr/bin/apt install --no-install-recommends -y libzstd-dev file
8686
8787
- name: Pepare for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
8888
if: matrix.os.matrix == 'linux'
@@ -100,9 +100,9 @@ jobs:
100100
version=`cat version`
101101
sudo tar -xvf dist/zstd-$version.tar.gz -C ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}}/build_wheel/
102102
false && sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} env
103-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc-14.3 -v
103+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} gcc -v
104104
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} pkg-config libzstd --modversion
105-
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ZSTD_ASM=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ${{matrix.os.pypkg}} setup.py bdist_wheel"
105+
sudo chroot ./ubuntu-${{matrix.os.release}}-${{matrix.os.arch}} /bin/bash -c "cd /build_wheel/zstd-$version && ZSTD_ASM=1 _ZSTD_ASM_BMI2=1 ZSTD_THREADS=1 _ZSTD_EXTERNAL=0 ZSTD_WERRORS=1 CC=gcc CXX=g++ LD=ld ${{matrix.os.pypkg}} setup.py bdist_wheel"
106106
107107
- name: Test wheel for ${{matrix.os.pypkg}} ${{matrix.os.arch}}
108108
if: matrix.os.matrix == 'linux'

0 commit comments

Comments
 (0)