Compare commits

..

No commits in common. "fefda85d2db0e516e34e83da05a38fd1e396a288" and "08b4242efe27c228a13ee49e9ab9bbaf71895367" have entirely different histories.

14 changed files with 36 additions and 36 deletions

View File

@ -230,14 +230,14 @@ jobs:
nodejs_version: "18.17.0"
nodejs_version_major: 18
- platform: linux-s390x
distro: bookworm
distro: bullseye
run_on_arch: s390x
nodejs_arch: s390x
nodejs_hostname: nodejs.org
nodejs_version: "18.17.0"
nodejs_version_major: 18
- platform: linux-ppc64
distro: bookworm
distro: bullseye
run_on_arch: ppc64le
nodejs_arch: ppc64le
nodejs_hostname: nodejs.org
@ -269,7 +269,7 @@ jobs:
contents: read
name: "build-wasm32 [package]"
runs-on: ubuntu-24.04
container: "emscripten/emsdk:4.0.11"
container: "emscripten/emsdk:4.0.10"
steps:
- uses: actions/checkout@v4
- name: Dependencies

View File

@ -48,8 +48,8 @@ Ready-compiled sharp and libvips binaries are provided for use on the most commo
* macOS ARM64
* Linux ARM (glibc >= 2.31)
* Linux ARM64 (glibc >= 2.26, musl >= 1.2.2)
* Linux ppc64 (glibc >= 2.36)
* Linux s390x (glibc >= 2.36)
* Linux ppc64 (glibc >= 2.31)
* Linux s390x (glibc >= 2.31)
* Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2)
* Windows x64
* Windows x86

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-darwin-arm64": "1.2.1"
"@img/sharp-libvips-darwin-arm64": "1.2.0"
},
"files": [
"lib"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-darwin-x64": "1.2.1"
"@img/sharp-libvips-darwin-x64": "1.2.0"
},
"files": [
"lib"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linux-arm": "1.2.1"
"@img/sharp-libvips-linux-arm": "1.2.0"
},
"files": [
"lib"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linux-arm64": "1.2.1"
"@img/sharp-libvips-linux-arm64": "1.2.0"
},
"files": [
"lib"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linux-ppc64": "1.2.1"
"@img/sharp-libvips-linux-ppc64": "1.2.0"
},
"files": [
"lib"
@ -32,7 +32,7 @@
"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
},
"config": {
"glibc": ">=2.36"
"glibc": ">=2.31"
},
"os": [
"linux"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linux-s390x": "1.2.1"
"@img/sharp-libvips-linux-s390x": "1.2.0"
},
"files": [
"lib"
@ -32,7 +32,7 @@
"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
},
"config": {
"glibc": ">=2.36"
"glibc": ">=2.31"
},
"os": [
"linux"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linux-x64": "1.2.1"
"@img/sharp-libvips-linux-x64": "1.2.0"
},
"files": [
"lib"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linuxmusl-arm64": "1.2.1"
"@img/sharp-libvips-linuxmusl-arm64": "1.2.0"
},
"files": [
"lib"

View File

@ -15,7 +15,7 @@
},
"preferUnplugged": true,
"optionalDependencies": {
"@img/sharp-libvips-linuxmusl-x64": "1.2.1"
"@img/sharp-libvips-linuxmusl-x64": "1.2.0"
},
"files": [
"lib"

View File

@ -31,7 +31,7 @@
"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
},
"dependencies": {
"@emnapi/runtime": "^1.4.5"
"@emnapi/runtime": "^1.4.4"
},
"cpu": [
"wasm32"

View File

@ -143,15 +143,15 @@
"optionalDependencies": {
"@img/sharp-darwin-arm64": "0.34.3",
"@img/sharp-darwin-x64": "0.34.3",
"@img/sharp-libvips-darwin-arm64": "1.2.1",
"@img/sharp-libvips-darwin-x64": "1.2.1",
"@img/sharp-libvips-linux-arm": "1.2.1",
"@img/sharp-libvips-linux-arm64": "1.2.1",
"@img/sharp-libvips-linux-ppc64": "1.2.1",
"@img/sharp-libvips-linux-s390x": "1.2.1",
"@img/sharp-libvips-linux-x64": "1.2.1",
"@img/sharp-libvips-linuxmusl-arm64": "1.2.1",
"@img/sharp-libvips-linuxmusl-x64": "1.2.1",
"@img/sharp-libvips-darwin-arm64": "1.2.0",
"@img/sharp-libvips-darwin-x64": "1.2.0",
"@img/sharp-libvips-linux-arm": "1.2.0",
"@img/sharp-libvips-linux-arm64": "1.2.0",
"@img/sharp-libvips-linux-ppc64": "1.2.0",
"@img/sharp-libvips-linux-s390x": "1.2.0",
"@img/sharp-libvips-linux-x64": "1.2.0",
"@img/sharp-libvips-linuxmusl-arm64": "1.2.0",
"@img/sharp-libvips-linuxmusl-x64": "1.2.0",
"@img/sharp-linux-arm": "0.34.3",
"@img/sharp-linux-arm64": "0.34.3",
"@img/sharp-linux-ppc64": "0.34.3",
@ -165,22 +165,22 @@
"@img/sharp-win32-x64": "0.34.3"
},
"devDependencies": {
"@emnapi/runtime": "^1.4.5",
"@img/sharp-libvips-dev": "1.2.1",
"@img/sharp-libvips-dev-wasm32": "1.2.1",
"@img/sharp-libvips-win32-arm64": "1.2.1",
"@img/sharp-libvips-win32-ia32": "1.2.1",
"@img/sharp-libvips-win32-x64": "1.2.1",
"@emnapi/runtime": "^1.4.4",
"@img/sharp-libvips-dev": "1.2.0",
"@img/sharp-libvips-dev-wasm32": "1.2.0",
"@img/sharp-libvips-win32-arm64": "1.2.0",
"@img/sharp-libvips-win32-ia32": "1.2.0",
"@img/sharp-libvips-win32-x64": "1.2.0",
"@types/node": "*",
"cc": "^3.0.1",
"emnapi": "^1.4.5",
"emnapi": "^1.4.4",
"exif-reader": "^2.0.2",
"extract-zip": "^2.0.1",
"icc": "^3.0.0",
"jsdoc-to-markdown": "^9.1.2",
"jsdoc-to-markdown": "^9.1.1",
"license-checker": "^25.0.1",
"mocha": "^11.7.1",
"node-addon-api": "^8.5.0",
"node-addon-api": "^8.4.0",
"node-gyp": "^11.2.0",
"nyc": "^17.1.0",
"semistandard": "^17.0.0",

View File

@ -179,7 +179,7 @@ describe('libvips binaries', function () {
process.env.npm_config_arch = 's390x';
process.env.npm_config_libc = '';
const locatorHash = libvips.yarnLocator();
assert.strictEqual(locatorHash, '7e40558001');
assert.strictEqual(locatorHash, '30afd744f9');
delete process.env.npm_config_platform;
delete process.env.npm_config_arch;
delete process.env.npm_config_libc;