From 4fcbd6700f7030c93361c76a03337e632227da75 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 3 May 2020 12:33:47 +0100 Subject: [PATCH] Add musl builds. --- .github/travis/before-install.sh | 5 +++++ .github/travis/build.sh | 8 ++++++++ .travis.yml | 33 ++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/.github/travis/before-install.sh b/.github/travis/before-install.sh index 22d93970..31fc5868 100644 --- a/.github/travis/before-install.sh +++ b/.github/travis/before-install.sh @@ -9,4 +9,9 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then pkg-config \ libutempter-dev \ build-essential + + if [ "$BUILD" = "musl" ]; then + sudo apt-get -y install musl-dev \ + musl-tools + fi fi diff --git a/.github/travis/build.sh b/.github/travis/build.sh index c244c59c..f863d8ad 100644 --- a/.github/travis/build.sh +++ b/.github/travis/build.sh @@ -10,6 +10,14 @@ case "$BUILD" in sh $(dirname $0)/build-all.sh exec make ;; + musl) + CC=musl-gcc sh $(dirname $0)/build-all.sh + exec make + ;; + musl-static) + CC=musl-gcc sh $(dirname $0)/build-all.sh --enable-static + exec make + ;; *) ./configure || exit 1 exec make diff --git a/.travis.yml b/.travis.yml index 5a205523..16a04a16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,15 +16,32 @@ env: - BUILD= - BUILD=static - BUILD=all + - BUILD=musl + - BUILD=musl-static jobs: exclude: + # Static builds are broken on OS X (by Apple) - os: osx compiler: gcc env: BUILD=static - os: osx compiler: clang env: BUILD=static + # No musl on OS X + - os: osx + compiler: gcc + env: BUILD=musl + - os: osx + compiler: clang + env: BUILD=musl + - os: osx + compiler: gcc + env: BUILD=musl-static + - os: osx + compiler: clang + env: BUILD=musl-static + # arm64 doesn't link ncurses - os: linux compiler: gcc arch: arm64 @@ -33,6 +50,22 @@ jobs: compiler: clang arch: arm64 env: BUILD=all + - os: linux + compiler: gcc + arch: arm64 + env: BUILD=musl + - os: linux + compiler: clang + arch: arm64 + env: BUILD=musl + - os: linux + compiler: gcc + arch: arm64 + env: BUILD=musl-static + - os: linux + compiler: clang + arch: arm64 + env: BUILD=musl-static before_install: - sh .github/travis/before-install.sh