mirror of
https://github.com/lovell/sharp.git
synced 2025-07-09 10:30:15 +02:00
Drop support for Node.js 10, upgrade to Node-API v5
This commit is contained in:
parent
cbaec198a5
commit
6d7a5ace6b
19
.github/workflows/ci.yml
vendored
19
.github/workflows/ci.yml
vendored
@ -11,43 +11,34 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: centos:7
|
container: centos:7
|
||||||
nodejs_version: 10
|
nodejs_version: 12
|
||||||
coverage: true
|
coverage: true
|
||||||
prebuild: true
|
prebuild: true
|
||||||
- os: ubuntu-20.04
|
|
||||||
container: centos:7
|
|
||||||
nodejs_version: 12
|
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: centos:7
|
container: centos:7
|
||||||
nodejs_version: 14
|
nodejs_version: 14
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: centos:7
|
container: centos:7
|
||||||
nodejs_version: 16
|
nodejs_version: 16
|
||||||
- os: ubuntu-20.04
|
|
||||||
container: node:10-alpine3.11
|
|
||||||
prebuild: true
|
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: node:12-alpine3.11
|
container: node:12-alpine3.11
|
||||||
|
prebuild: true
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: node:14-alpine3.11
|
container: node:14-alpine3.11
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: node:14-alpine3.13
|
container: node:14-alpine3.13
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
container: node:16-alpine3.11
|
container: node:16-alpine3.11
|
||||||
- os: macos-10.15
|
|
||||||
nodejs_version: 10
|
|
||||||
prebuild: true
|
|
||||||
- os: macos-10.15
|
- os: macos-10.15
|
||||||
nodejs_version: 12
|
nodejs_version: 12
|
||||||
|
prebuild: true
|
||||||
- os: macos-10.15
|
- os: macos-10.15
|
||||||
nodejs_version: 14
|
nodejs_version: 14
|
||||||
- os: macos-10.15
|
- os: macos-10.15
|
||||||
nodejs_version: 16
|
nodejs_version: 16
|
||||||
- os: windows-2019
|
|
||||||
nodejs_version: 10
|
|
||||||
prebuild: true
|
|
||||||
- os: windows-2019
|
- os: windows-2019
|
||||||
nodejs_version: 12
|
nodejs_version: 12
|
||||||
|
prebuild: true
|
||||||
- os: windows-2019
|
- os: windows-2019
|
||||||
nodejs_version: 14
|
nodejs_version: 14
|
||||||
- os: windows-2019
|
- os: windows-2019
|
||||||
@ -86,4 +77,4 @@ jobs:
|
|||||||
if: matrix.prebuild && startsWith(github.ref, 'refs/tags/')
|
if: matrix.prebuild && startsWith(github.ref, 'refs/tags/')
|
||||||
env:
|
env:
|
||||||
prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
|
prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: npx prebuild --runtime napi --target 3
|
run: npx prebuild --runtime napi --target 5
|
||||||
|
29
.travis.yml
29
.travis.yml
@ -1,20 +1,5 @@
|
|||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 10"
|
|
||||||
arch: arm64
|
|
||||||
os: linux
|
|
||||||
dist: bionic
|
|
||||||
language: shell
|
|
||||||
before_install:
|
|
||||||
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye
|
|
||||||
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl"
|
|
||||||
- sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
|
|
||||||
- sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_10.x sid main' >/etc/apt/sources.list.d/nodesource.list"
|
|
||||||
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs=10.*"
|
|
||||||
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
|
||||||
after_success: "[[ -n $TRAVIS_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 3\""
|
|
||||||
|
|
||||||
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 12"
|
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 12"
|
||||||
arch: arm64
|
arch: arm64
|
||||||
os: linux
|
os: linux
|
||||||
@ -28,6 +13,7 @@ jobs:
|
|||||||
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
|
||||||
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
|
after_success: "[[ -n $TRAVIS_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 5\""
|
||||||
|
|
||||||
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 14"
|
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 14"
|
||||||
arch: arm64
|
arch: arm64
|
||||||
@ -58,18 +44,6 @@ jobs:
|
|||||||
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
|
|
||||||
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 10"
|
|
||||||
arch: arm64
|
|
||||||
os: linux
|
|
||||||
dist: focal
|
|
||||||
language: shell
|
|
||||||
before_install:
|
|
||||||
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:10-alpine3.11
|
|
||||||
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
|
||||||
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
|
||||||
after_success: "[[ -n $TRAVIS_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 3\""
|
|
||||||
|
|
||||||
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 12"
|
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 12"
|
||||||
arch: arm64
|
arch: arm64
|
||||||
os: linux
|
os: linux
|
||||||
@ -80,6 +54,7 @@ jobs:
|
|||||||
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
||||||
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
|
after_success: "[[ -n $TRAVIS_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 5\""
|
||||||
|
|
||||||
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 14"
|
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 14"
|
||||||
arch: arm64
|
arch: arm64
|
||||||
|
@ -99,7 +99,7 @@ A [guide for contributors](https://github.com/lovell/sharp/blob/master/.github/C
|
|||||||
covers reporting bugs, requesting features and submitting code changes.
|
covers reporting bugs, requesting features and submitting code changes.
|
||||||
|
|
||||||
[](https://coveralls.io/r/lovell/sharp?branch=master)
|
[](https://coveralls.io/r/lovell/sharp?branch=master)
|
||||||
[](https://nodejs.org/dist/latest/docs/api/n-api.html#n_api_n_api_version_matrix)
|
[](https://nodejs.org/dist/latest/docs/api/n-api.html#n_api_n_api_version_matrix)
|
||||||
|
|
||||||
## Licensing
|
## Licensing
|
||||||
|
|
||||||
|
@ -4,9 +4,8 @@ build: off
|
|||||||
platform: x86
|
platform: x86
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
- nodejs_version: "10"
|
|
||||||
prebuild: true
|
|
||||||
- nodejs_version: "12"
|
- nodejs_version: "12"
|
||||||
|
prebuild: true
|
||||||
- nodejs_version: "14"
|
- nodejs_version: "14"
|
||||||
- nodejs_version: "16"
|
- nodejs_version: "16"
|
||||||
install:
|
install:
|
||||||
@ -15,4 +14,4 @@ install:
|
|||||||
test_script:
|
test_script:
|
||||||
- npm test
|
- npm test
|
||||||
on_success:
|
on_success:
|
||||||
- if [%prebuild%] == [true] if [%APPVEYOR_REPO_TAG%] == [true] npx prebuild --runtime napi --target 3
|
- if [%prebuild%] == [true] if [%APPVEYOR_REPO_TAG%] == [true] npx prebuild --runtime napi --target 5
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
'msvs_settings': {
|
'msvs_settings': {
|
||||||
'VCCLCompilerTool': {
|
'VCCLCompilerTool': {
|
||||||
'ExceptionHandling': 1,
|
'ExceptionHandling': 1,
|
||||||
|
'Optimization': 1,
|
||||||
'WholeProgramOptimization': 'true'
|
'WholeProgramOptimization': 'true'
|
||||||
},
|
},
|
||||||
'VCLibrarianTool': {
|
'VCLibrarianTool': {
|
||||||
@ -67,7 +68,7 @@
|
|||||||
}, {
|
}, {
|
||||||
'target_name': 'sharp',
|
'target_name': 'sharp',
|
||||||
'defines': [
|
'defines': [
|
||||||
'NAPI_VERSION=3'
|
'NAPI_VERSION=5'
|
||||||
],
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'<!(node -p "require(\'node-addon-api\').gyp")',
|
'<!(node -p "require(\'node-addon-api\').gyp")',
|
||||||
@ -172,7 +173,7 @@
|
|||||||
'-std=c++0x',
|
'-std=c++0x',
|
||||||
'-fexceptions',
|
'-fexceptions',
|
||||||
'-Wall',
|
'-Wall',
|
||||||
'-O3'
|
'-Os'
|
||||||
],
|
],
|
||||||
'xcode_settings': {
|
'xcode_settings': {
|
||||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
|
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
|
||||||
@ -182,7 +183,7 @@
|
|||||||
'OTHER_CPLUSPLUSFLAGS': [
|
'OTHER_CPLUSPLUSFLAGS': [
|
||||||
'-fexceptions',
|
'-fexceptions',
|
||||||
'-Wall',
|
'-Wall',
|
||||||
'-O3'
|
'-Oz'
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
'configurations': {
|
'configurations': {
|
||||||
@ -202,6 +203,7 @@
|
|||||||
'msvs_settings': {
|
'msvs_settings': {
|
||||||
'VCCLCompilerTool': {
|
'VCCLCompilerTool': {
|
||||||
'ExceptionHandling': 1,
|
'ExceptionHandling': 1,
|
||||||
|
'Optimization': 1,
|
||||||
'WholeProgramOptimization': 'true'
|
'WholeProgramOptimization': 'true'
|
||||||
},
|
},
|
||||||
'VCLibrarianTool': {
|
'VCLibrarianTool': {
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## v0.28 - *circle*
|
## v0.29 - *circle*
|
||||||
|
|
||||||
Requires libvips v8.11.0
|
Requires libvips v8.11.0
|
||||||
|
|
||||||
### v0.29.0 - TBD
|
### v0.29.0 - TBD
|
||||||
|
|
||||||
|
* Drop support for Node.js 10, now requires Node.js >= 12.13.0.
|
||||||
|
|
||||||
## v0.28 - *bijou*
|
## v0.28 - *bijou*
|
||||||
|
|
||||||
Requires libvips v8.10.6
|
Requires libvips v8.10.6
|
||||||
|
14
package.json
14
package.json
@ -123,8 +123,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"color": "^3.1.3",
|
"color": "^3.1.3",
|
||||||
"detect-libc": "^1.0.3",
|
"detect-libc": "^1.0.3",
|
||||||
"node-addon-api": "^3.2.0",
|
"node-addon-api": "^3.2.1",
|
||||||
"prebuild-install": "^6.1.2",
|
"prebuild-install": "^6.1.3",
|
||||||
"semver": "^7.3.5",
|
"semver": "^7.3.5",
|
||||||
"simple-get": "^3.1.0",
|
"simple-get": "^3.1.0",
|
||||||
"tar-fs": "^2.1.1",
|
"tar-fs": "^2.1.1",
|
||||||
@ -138,8 +138,8 @@
|
|||||||
"exif-reader": "^1.0.3",
|
"exif-reader": "^1.0.3",
|
||||||
"icc": "^2.0.0",
|
"icc": "^2.0.0",
|
||||||
"license-checker": "^25.0.1",
|
"license-checker": "^25.0.1",
|
||||||
"mocha": "^8.4.0",
|
"mocha": "^9.0.0",
|
||||||
"mock-fs": "^4.14.0",
|
"mock-fs": "^5.0.0",
|
||||||
"nyc": "^15.1.0",
|
"nyc": "^15.1.0",
|
||||||
"prebuild": "^10.0.1",
|
"prebuild": "^10.0.1",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
@ -149,17 +149,17 @@
|
|||||||
"config": {
|
"config": {
|
||||||
"libvips": "8.11.0-rc1",
|
"libvips": "8.11.0-rc1",
|
||||||
"runtime": "napi",
|
"runtime": "napi",
|
||||||
"target": 3
|
"target": 5
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10"
|
"node": ">=12.13.0"
|
||||||
},
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://opencollective.com/libvips"
|
"url": "https://opencollective.com/libvips"
|
||||||
},
|
},
|
||||||
"binary": {
|
"binary": {
|
||||||
"napi_versions": [
|
"napi_versions": [
|
||||||
3
|
5
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"semistandard": {
|
"semistandard": {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user