From 9b985295ae6366b96ef7986cf1bc7df50e6ee087 Mon Sep 17 00:00:00 2001 From: Tpt Date: Thu, 21 Sep 2023 08:29:41 +0200 Subject: [PATCH] Drops Musl linux 1.1 support Follows Rust move --- .github/workflows/artifacts.yml | 2 +- .github/workflows/musllinux_build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 3951704e..c0dd2abf 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -152,7 +152,7 @@ jobs: if: github.event_name == 'release' && matrix.architecture != 'x86_64' - uses: Swatinem/rust-cache@v2 - run: sed 's/%arch%/${{ matrix.architecture }}/g' .github/workflows/musllinux_build.sh | sed 's/%for_each_version%/${{ github.event_name == 'release' || '' }}/g' > .github/workflows/musllinux_build_script.sh - - run: docker run -v "$(pwd)":/workdir --platform linux/${{ matrix.architecture }} quay.io/pypa/musllinux_1_1_${{ matrix.architecture }} /bin/bash /workdir/.github/workflows/musllinux_build_script.sh + - run: docker run -v "$(pwd)":/workdir --platform linux/${{ matrix.architecture }} quay.io/pypa/musllinux_1_2_${{ matrix.architecture }} /bin/bash /workdir/.github/workflows/musllinux_build_script.sh if: github.event_name == 'release' || matrix.architecture == 'x86_64' - uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/musllinux_build.sh b/.github/workflows/musllinux_build.sh index 8abc5b0d..674be63a 100644 --- a/.github/workflows/musllinux_build.sh +++ b/.github/workflows/musllinux_build.sh @@ -11,9 +11,9 @@ source venv/bin/activate pip install -r requirements.dev.txt maturin develop --release python generate_stubs.py pyoxigraph pyoxigraph.pyi --black -maturin build --release --features abi3 --compatibility musllinux_1_1 +maturin build --release --features abi3 --compatibility musllinux_1_2 if [ %for_each_version% ]; then for VERSION in 7 8 9 10 11; do - maturin build --release --interpreter "python3.$VERSION" --compatibility musllinux_1_1 + maturin build --release --interpreter "python3.$VERSION" --compatibility musllinux_1_2 done fi