Skip to content

Commit ccf322a

Browse files
committed
feature: add musllinux_1_2
1 parent 129380e commit ccf322a

File tree

9 files changed

+29
-11
lines changed

9 files changed

+29
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
policy: ["manylinux2014", "musllinux_1_1"]
35+
policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"]
3636
platform: ["i686", "x86_64"]
3737
include:
3838
- policy: "manylinux_2_28"

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ jobs:
4646
env: POLICY="musllinux_1_1" PLATFORM="s390x"
4747
- arch: ppc64le
4848
env: POLICY="musllinux_1_1" PLATFORM="ppc64le"
49+
- arch: arm64-graviton2
50+
virt: vm
51+
group: edge
52+
env: POLICY="musllinux_1_2" PLATFORM="aarch64"
53+
- arch: s390x
54+
env: POLICY="musllinux_1_2" PLATFORM="s390x"
55+
- arch: ppc64le
56+
env: POLICY="musllinux_1_2" PLATFORM="ppc64le"
4957

5058
before_install:
5159
- if [ -d "${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM}" ]; then cp -rlf ${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM} ./; fi

build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ elif [ "${POLICY}" == "musllinux_1_1" ]; then
5151
DEVTOOLSET_ROOTPATH=
5252
PREPEND_PATH=
5353
LD_LIBRARY_PATH_ARG=
54+
elif [ "${POLICY}" == "musllinux_1_2" ]; then
55+
BASEIMAGE="${MULTIARCH_PREFIX}alpine:3.18"
56+
DEVTOOLSET_ROOTPATH=
57+
PREPEND_PATH=
58+
LD_LIBRARY_PATH_ARG=
5459
else
5560
echo "Unsupported policy: '${POLICY}'"
5661
exit 1

docker/build_scripts/build-git.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
1010
# Get build utilities
1111
source $MY_DIR/build_utils.sh
1212

13-
if [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
13+
if [ "${BASE_POLICY}" == "musllinux" ]; then
1414
export NO_REGEX=NeedsStartEnd
1515
fi
1616

docker/build_scripts/install-build-packages.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,24 @@
44
# Stop at any error, show all commands
55
set -exuo pipefail
66

7+
# Set build environment variables
8+
MY_DIR=$(dirname "${BASH_SOURCE[0]}")
9+
10+
# Get build utilities
11+
source $MY_DIR/build_utils.sh
712

813
# if a devel package is added to COMPILE_DEPS,
914
# make sure the corresponding library is added to RUNTIME_DEPS if applicable
1015

11-
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
16+
if [ "${BASE_POLICY}" == "manylinux" ]; then
1217
COMPILE_DEPS="bzip2-devel ncurses-devel readline-devel gdbm-devel libpcap-devel xz-devel openssl openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel uuid-devel libffi-devel kernel-headers libdb-devel"
1318
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
1419
PACKAGE_MANAGER=yum
1520
else
1621
PACKAGE_MANAGER=dnf
1722
COMPILE_DEPS="${COMPILE_DEPS} tk-devel"
1823
fi
19-
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
24+
elif [ "${BASE_POLICY}" == "musllinux" ]; then
2025
PACKAGE_MANAGER=apk
2126
COMPILE_DEPS="bzip2-dev ncurses-dev readline-dev tk-dev gdbm-dev libpcap-dev xz-dev openssl openssl-dev keyutils-dev krb5-dev libcom_err libidn-dev curl-dev util-linux-dev libffi-dev linux-headers"
2227
else

docker/build_scripts/install-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ if [ "${AUDITWHEEL_PLAT}" = "manylinux2014_i686" ]; then
2323
LC_ALL=C "${MY_DIR}/update-system-packages.sh"
2424
fi
2525

26-
if [ "${AUDITWHEEL_POLICY}" = "musllinux_1_1" ]; then
26+
if [ "${AUDITWHEEL_POLICY}" = "musllinux_1_1" ] || [ "${AUDITWHEEL_POLICY}" = "musllinux_1_2" ]; then
2727
apk add --no-cache bash
2828
fi

docker/build_scripts/install-runtime-packages.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ source $MY_DIR/build_utils.sh
3434
# MANYLINUX_DEPS: Install development packages (except for libgcc which is provided by gcc install)
3535
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
3636
MANYLINUX_DEPS="glibc-devel libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel zlib-devel expat-devel"
37-
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
37+
elif [ "${BASE_POLICY}" == "musllinux" ]; then
3838
MANYLINUX_DEPS="musl-dev libstdc++ glib-dev libx11-dev libxext-dev libxrender-dev mesa-dev libice-dev libsm-dev zlib-dev expat-dev"
3939
else
4040
echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"
@@ -47,8 +47,8 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ] || [ "${AUDITWHEEL_POLICY}" ==
4747
if [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
4848
RUNTIME_DEPS="${RUNTIME_DEPS} tk"
4949
fi
50-
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
51-
RUNTIME_DEPS="zlib bzip2 expat ncurses5-libs readline tk gdbm db xz openssl keyutils-libs krb5-libs libcom_err libidn2 libcurl libuuid libffi"
50+
elif [ "${BASE_POLICY}" == "musllinux" ]; then
51+
RUNTIME_DEPS="zlib bzip2 expat ncurses-libs readline tk gdbm db xz openssl keyutils-libs krb5-libs libcom_err libidn2 libcurl libuuid libffi"
5252
else
5353
echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"
5454
exit 1
@@ -100,7 +100,7 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
100100
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
101101
TOOLCHAIN_DEPS="${TOOLCHAIN_DEPS} yasm"
102102
fi
103-
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
103+
elif [ "${BASE_POLICY}" == "musllinux" ]; then
104104
TOOLCHAIN_DEPS="binutils gcc g++ gfortran"
105105
BASETOOLS="${BASETOOLS} curl util-linux tar"
106106
PACKAGE_MANAGER=apk

docker/build_scripts/update-system-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
2424
dnf -y upgrade
2525
dnf clean all
2626
rm -rf /var/cache/yum
27-
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
27+
elif [ "${BASE_POLICY}" == "musllinux" ]; then
2828
apk upgrade --no-cache
2929
else
3030
echo "Unsupported policy: '${AUDITWHEEL_POLICY}'"

tests/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ MY_DIR=$(dirname "${BASH_SOURCE[0]}")
88

99
if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
1010
PACKAGE_MANAGER=yum
11-
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
11+
elif [ "${AUDITWHEEL_POLICY:0:10}" == "musllinux_" ]; then
1212
PACKAGE_MANAGER=apk
1313
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_28" ]; then
1414
PACKAGE_MANAGER=dnf

0 commit comments

Comments
 (0)