From 6851f86a19ab0dd92697a0a3fc19a0699daa0641 Mon Sep 17 00:00:00 2001 From: Dmitry Volodin Date: Wed, 10 Jan 2024 17:54:21 +0100 Subject: [PATCH] Build on GLibc 2.28 rather than on 2.24 --- .github/workflows/package.yml | 8 ++++---- CHANGELOG.md | 1 + tools/build/setup-snmpd.sh | 9 +-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 9999d25..704a37a 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -66,8 +66,8 @@ jobs: name: wheel_manylinux_2_17_${{ matrix.arch }} path: wheelhouse/*.whl - # glibc 2.24, x86_64/aarch64 (Debian 9) - build-manylinux_2_24: + # glibc 2.28, x86_64/aarch64 + build-manylinux_2_28: runs-on: ubuntu-22.04 needs: build-sdist strategy: @@ -99,7 +99,7 @@ jobs: -w /workdir --user 0 --platform ${{ matrix.platform }} - quay.io/pypa/manylinux_2_24_${{ matrix.arch }}:latest + quay.io/pypa/manylinux_2_28_${{ matrix.arch }}:latest ./tools/build/build-many.sh 3.8 3.9 3.10 3.11 3.12 - name: Save Artefacts @@ -192,7 +192,7 @@ jobs: needs: - build-sdist - build-manylinux_2_17-x86_64 - - build-manylinux_2_24 + - build-manylinux_2_28 # - build-musllinux-1_1 # - build-wheel-macos steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a44e04..fa06d8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ To see unreleased changes, please see the [CHANGELOG on the main branch guide](h ### Changed * docs: Fancy front page +* Build on GLibc 2.28 rather than on 2.24 ### Infrastructure diff --git a/tools/build/setup-snmpd.sh b/tools/build/setup-snmpd.sh index b891b6f..3d34939 100755 --- a/tools/build/setup-snmpd.sh +++ b/tools/build/setup-snmpd.sh @@ -33,14 +33,7 @@ case $OS in /usr/sbin/snmpd --version ;; debian) - SOURCES_LIST="/etc/apt/sources.list" - if [ -e "$SOURCES_LIST" ]; then - if grep -q "stretch main" "$SOURCES_LIST"; then - # Switch Debian9 to archive - sed -i "s/deb.debian.org/archive.debian.org/g" "$SOURCES_LIST" - fi - fi - $SUDO apt-get update || true + $SUDO apt-get update $SUDO apt-get install -y --no-install-recommends snmpd # Test /usr/sbin/snmpd --version