From 4d2784c10c6ce8191242e0722276eec8f62f372d Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 8 Mar 2021 16:15:47 +0000 Subject: [PATCH] Prebuilt libvips v8.10.6 binaries work with musl 1.1.x and 1.2.x --- .github/workflows/ci.yml | 2 ++ docs/install.md | 2 +- install/libvips.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcb4f3fd..eefcee3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,8 @@ jobs: container: node:12-alpine3.11 - os: ubuntu-20.04 container: node:14-alpine3.11 + - os: ubuntu-20.04 + container: node:14-alpine3.13 - os: ubuntu-20.04 container: node:15-alpine3.11 - os: macos-10.15 diff --git a/docs/install.md b/docs/install.md index 6145672f..32c84371 100644 --- a/docs/install.md +++ b/docs/install.md @@ -18,7 +18,7 @@ Ready-compiled sharp and libvips binaries are provided for use with Node.js v10+ on the most common platforms: * macOS x64 (>= 10.13) -* Linux x64 (glibc >= 2.17, musl >=1.1.24 <1.2.0) +* Linux x64 (glibc >= 2.17, musl >= 1.1.24) * Linux ARM64 (glibc >= 2.29) * Linux ARM64 (musl >= 1.1.24) * Windows x64 diff --git a/install/libvips.js b/install/libvips.js index 2193a427..35f68fd1 100644 --- a/install/libvips.js +++ b/install/libvips.js @@ -101,7 +101,7 @@ try { } } if (detectLibc.family === detectLibc.MUSL && detectLibc.version) { - if (!semver.satisfies(detectLibc.version, '>=1.1.24 <1.2.0')) { + if (semver.lt(detectLibc.version, '1.1.24')) { throw new Error(`Use with musl ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion}`); } }