Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 18:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

CI: replace Node.js 15 with 16

Browse Source
This commit is contained in:
Lovell Fuller 2021-05-01 15:56:10 +01:00
parent e1760d64fb
commit a688468378
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
nodejs_version: 14 nodejs_version: 14
- os: ubuntu-20.04 - os: ubuntu-20.04
container: centos:7 container: centos:7
nodejs_version: 15 nodejs_version: 16
- os: ubuntu-20.04 - os: ubuntu-20.04
container: node:10-alpine3.11 container: node:10-alpine3.11
prebuild: true prebuild: true
@ -33,7 +33,7 @@ jobs:
- 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:15-alpine3.11 container: node:16-alpine3.11
- os: macos-10.15 - os: macos-10.15
nodejs_version: 10 nodejs_version: 10
prebuild: true prebuild: true
@ -42,7 +42,7 @@ jobs:
- os: macos-10.15 - os: macos-10.15
nodejs_version: 14 nodejs_version: 14
- os: macos-10.15 - os: macos-10.15
nodejs_version: 15 nodejs_version: 16
- os: windows-2019 - os: windows-2019
nodejs_version: 10 nodejs_version: 10
prebuild: true prebuild: true
@ -51,7 +51,7 @@ jobs:
- os: windows-2019 - os: windows-2019
nodejs_version: 14 nodejs_version: 14
- os: windows-2019 - os: windows-2019
nodejs_version: 15 nodejs_version: 16
steps: steps:
- name: Dependencies (Linux glibc) - name: Dependencies (Linux glibc)
if: contains(matrix.container, 'centos') if: contains(matrix.container, 'centos')

8
.travis.yml
View File

@ -43,7 +43,7 @@ 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 (Debian 11, glibc 2.29) - Node.js 15" - name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 16"
arch: arm64 arch: arm64
os: linux os: linux
dist: bionic dist: bionic
@ -53,7 +53,7 @@ jobs:
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye - 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 "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 "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_15.x sid main' >/etc/apt/sources.list.d/nodesource.list" - sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_16.x sid main' >/etc/apt/sources.list.d/nodesource.list"
- 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"
@ -92,14 +92,14 @@ 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 15" - name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 16"
arch: arm64 arch: arm64
os: linux os: linux
dist: focal dist: focal
language: shell language: shell
before_install: before_install:
- sudo chown 0.0 ${PWD} - sudo chown 0.0 ${PWD}
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:15-alpine3.11 - sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:16-alpine3.11
- 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"

2
appveyor.yml
View File

@ -8,7 +8,7 @@ environment:
prebuild: true prebuild: true
- nodejs_version: "12" - nodejs_version: "12"
- nodejs_version: "14" - nodejs_version: "14"
- nodejs_version: "15" - nodejs_version: "16"
install: install:
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
- npm install --build-from-source - npm install --build-from-source

30
test/unit/platform.js
View File

@ -32,23 +32,21 @@ describe('Platform-detection', function () {
delete process.env.npm_config_arch; delete process.env.npm_config_arch;
}); });
it('Can detect ARM version via process.config', function () { if (process.config.variables.arm_version) {
process.env.npm_config_arch = 'arm'; it('Can detect ARM version via process.config', function () {
const armVersion = process.config.variables.arm_version; process.env.npm_config_arch = 'arm';
process.config.variables.arm_version = 'test'; assert.strictEqual(`armv${process.config.variables.arm_version}`, platform().split('-')[1]);
assert.strictEqual('armvtest', platform().split('-')[1]); delete process.env.npm_config_arch;
process.config.variables.arm_version = armVersion; });
delete process.env.npm_config_arch; }
});
it('Defaults to ARMv6 for 32-bit', function () { if (!process.config.variables.arm_version) {
process.env.npm_config_arch = 'arm'; it('Defaults to ARMv6 for 32-bit', function () {
const armVersion = process.config.variables.arm_version; process.env.npm_config_arch = 'arm';
delete process.config.variables.arm_version; assert.strictEqual('armv6', platform().split('-')[1]);
assert.strictEqual('armv6', platform().split('-')[1]); delete process.env.npm_config_arch;
process.config.variables.arm_version = armVersion; });
delete process.env.npm_config_arch; }
});
it('Defaults to ARMv8 for 64-bit', function () { it('Defaults to ARMv8 for 64-bit', function () {
process.env.npm_config_arch = 'arm64'; process.env.npm_config_arch = 'arm64';