mirror of
https://github.com/lovell/sharp.git
synced 2026-02-06 14:46:16 +01:00
Compare commits
5 Commits
v0.33.0-al
...
v0.33.0-al
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
946976ba8f | ||
|
|
29a83250a4 | ||
|
|
3f54ef7525 | ||
|
|
4dc2467f49 | ||
|
|
f54ceb0973 |
@@ -42,7 +42,7 @@ jobs:
|
|||||||
sudo docker exec sharp sh -c "npm run clean"
|
sudo docker exec sharp sh -c "npm run clean"
|
||||||
sudo docker exec sharp sh -c "npm install --ignore-scripts"
|
sudo docker exec sharp sh -c "npm install --ignore-scripts"
|
||||||
sudo docker exec sharp sh -c "npm test"
|
sudo docker exec sharp sh -c "npm test"
|
||||||
- run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --upload=$prebuild_upload\" || true"
|
- run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"cd src && ln -s ../package.json && npx prebuild --upload=$prebuild_upload\" || true"
|
||||||
linux-arm64-glibc-node-20:
|
linux-arm64-glibc-node-20:
|
||||||
resource_class: arm.medium
|
resource_class: arm.medium
|
||||||
machine:
|
machine:
|
||||||
@@ -83,7 +83,7 @@ jobs:
|
|||||||
sudo docker exec sharp sh -c "npm run clean"
|
sudo docker exec sharp sh -c "npm run clean"
|
||||||
sudo docker exec sharp sh -c "npm install --ignore-scripts"
|
sudo docker exec sharp sh -c "npm install --ignore-scripts"
|
||||||
sudo docker exec sharp sh -c "npm test"
|
sudo docker exec sharp sh -c "npm test"
|
||||||
- run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --upload=$prebuild_upload\" || true"
|
- run: "[[ -n $CIRCLE_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"cd src && ln -s ../package.json && npx prebuild --upload=$prebuild_upload\" || true"
|
||||||
linux-arm64-musl-node-20:
|
linux-arm64-musl-node-20:
|
||||||
resource_class: arm.medium
|
resource_class: arm.medium
|
||||||
machine:
|
machine:
|
||||||
|
|||||||
9
.github/workflows/ci.yml
vendored
9
.github/workflows/ci.yml
vendored
@@ -114,7 +114,10 @@ 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
|
run: |
|
||||||
|
node -e "require('fs').cpSync('package.json', 'src/package.json')"
|
||||||
|
cd src
|
||||||
|
npx prebuild
|
||||||
github-runner-qemu:
|
github-runner-qemu:
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -142,7 +145,7 @@ jobs:
|
|||||||
npm run clean
|
npm run clean
|
||||||
npm install --ignore-scripts
|
npm install --ignore-scripts
|
||||||
npx mocha --no-config --spec=test/unit/io.js --timeout=30000
|
npx mocha --no-config --spec=test/unit/io.js --timeout=30000
|
||||||
[[ -n $prebuild_upload ]] && npx prebuild || true
|
[[ -n $prebuild_upload ]] && cd src && ln -s ../package.json && npx prebuild || true
|
||||||
macstadium-runner:
|
macstadium-runner:
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -187,4 +190,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
|
run: cd src && ln -s ../package.json && npx prebuild
|
||||||
|
|||||||
78
.github/workflows/npm.yml
vendored
Normal file
78
.github/workflows/npm.yml
vendored
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
name: "npm release smoke test"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v**"
|
||||||
|
|
||||||
|
permissions: {}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release-smoke-test:
|
||||||
|
name: "${{ github.ref }} ${{ matrix.name }}"
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- name: linux-x64
|
||||||
|
os: ubuntu-22.04
|
||||||
|
- name: darwin-x64
|
||||||
|
os: macos-11
|
||||||
|
- name: win32-x64
|
||||||
|
os: windows-2019
|
||||||
|
steps:
|
||||||
|
- name: Install Node.js
|
||||||
|
uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 20
|
||||||
|
- name: Install Deno
|
||||||
|
uses: denoland/setup-deno@v1
|
||||||
|
with:
|
||||||
|
deno-version: v1.x
|
||||||
|
- name: Install Bun
|
||||||
|
if: ${{ !contains(matrix.os, 'windows') }}
|
||||||
|
uses: oven-sh/setup-bun@v1
|
||||||
|
with:
|
||||||
|
bun-version: latest
|
||||||
|
|
||||||
|
- name: Version
|
||||||
|
id: version
|
||||||
|
uses: actions/github-script@v6
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
core.setOutput('semver', context.ref.replace('refs/tags/v',''))
|
||||||
|
- name: Create package.json
|
||||||
|
uses: DamianReeves/write-file-action@v1
|
||||||
|
with:
|
||||||
|
path: package.json
|
||||||
|
contents: |
|
||||||
|
{
|
||||||
|
"dependencies": {
|
||||||
|
"sharp": "${{ steps.version.outputs.semver }}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- name: Create release.mjs
|
||||||
|
uses: DamianReeves/write-file-action@v1
|
||||||
|
with:
|
||||||
|
path: release.mjs
|
||||||
|
contents: |
|
||||||
|
import { createRequire } from 'node:module';
|
||||||
|
import { deepStrictEqual } from 'node:assert';
|
||||||
|
const require = createRequire(import.meta.url);
|
||||||
|
const sharp = require('sharp');
|
||||||
|
deepStrictEqual(['.jpg', '.jpeg', '.jpe'], sharp.format.jpeg.input.fileSuffix);
|
||||||
|
|
||||||
|
- name: Run with Node.js
|
||||||
|
run: |
|
||||||
|
npm install --ignore-scripts
|
||||||
|
node release.mjs
|
||||||
|
|
||||||
|
- name: Run with Deno
|
||||||
|
run: deno run --allow-read --allow-ffi release.mjs
|
||||||
|
|
||||||
|
- name: Run with Bun
|
||||||
|
if: ${{ !contains(matrix.os, 'windows') }}
|
||||||
|
run: |
|
||||||
|
bun install --ignore-scripts
|
||||||
|
bun release.mjs
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-darwin-arm64",
|
"name": "@sharpen/sharp-darwin-arm64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with macOS ARM64",
|
"description": "Prebuilt sharp for use with macOS ARM64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-darwin-x64",
|
"name": "@sharpen/sharp-darwin-x64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with macOS x64",
|
"description": "Prebuilt sharp for use with macOS x64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-linux-arm",
|
"name": "@sharpen/sharp-linux-arm",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
|
"description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-linux-arm64",
|
"name": "@sharpen/sharp-linux-arm64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Linux (glibc) ARM64",
|
"description": "Prebuilt sharp for use with Linux (glibc) ARM64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-linux-x64",
|
"name": "@sharpen/sharp-linux-x64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Linux (glibc) x64",
|
"description": "Prebuilt sharp for use with Linux (glibc) x64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-linuxmusl-arm64",
|
"name": "@sharpen/sharp-linuxmusl-arm64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Linux (musl) ARM64",
|
"description": "Prebuilt sharp for use with Linux (musl) ARM64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-linuxmusl-x64",
|
"name": "@sharpen/sharp-linuxmusl-x64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Linux (musl) x64",
|
"description": "Prebuilt sharp for use with Linux (musl) x64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-win32-ia32",
|
"name": "@sharpen/sharp-win32-ia32",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Windows x86 (32-bit)",
|
"description": "Prebuilt sharp for use with Windows x86 (32-bit)",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@sharpen/sharp-win32-x64",
|
"name": "@sharpen/sharp-win32-x64",
|
||||||
"version": "0.0.1-alpha.5",
|
"version": "0.0.1-alpha.6",
|
||||||
"description": "Prebuilt sharp for use with Windows x64",
|
"description": "Prebuilt sharp for use with Windows x64",
|
||||||
"homepage": "https://sharp.pixelplumbing.com",
|
"homepage": "https://sharp.pixelplumbing.com",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
20
package.json
20
package.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "sharp",
|
"name": "sharp",
|
||||||
"description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
|
"description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, GIF, AVIF and TIFF images",
|
||||||
"version": "0.33.0-alpha.5",
|
"version": "0.33.0-alpha.6",
|
||||||
"author": "Lovell Fuller <npm@lovell.info>",
|
"author": "Lovell Fuller <npm@lovell.info>",
|
||||||
"homepage": "https://github.com/lovell/sharp",
|
"homepage": "https://github.com/lovell/sharp",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
@@ -139,8 +139,8 @@
|
|||||||
"semver": "^7.5.4"
|
"semver": "^7.5.4"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@sharpen/sharp-darwin-arm64": "0.0.1-alpha.5",
|
"@sharpen/sharp-darwin-arm64": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-darwin-x64": "0.0.1-alpha.5",
|
"@sharpen/sharp-darwin-x64": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.2",
|
||||||
"@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.2",
|
||||||
"@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.2",
|
||||||
@@ -148,13 +148,13 @@
|
|||||||
"@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.2",
|
||||||
"@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.2",
|
||||||
"@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.2",
|
||||||
"@sharpen/sharp-linux-arm": "0.0.1-alpha.5",
|
"@sharpen/sharp-linux-arm": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-linux-arm64": "0.0.1-alpha.5",
|
"@sharpen/sharp-linux-arm64": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-linux-x64": "0.0.1-alpha.5",
|
"@sharpen/sharp-linux-x64": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.5",
|
"@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.5",
|
"@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-win32-ia32": "0.0.1-alpha.5",
|
"@sharpen/sharp-win32-ia32": "0.0.1-alpha.6",
|
||||||
"@sharpen/sharp-win32-x64": "0.0.1-alpha.5"
|
"@sharpen/sharp-win32-x64": "0.0.1-alpha.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@sharpen/sharp-libvips-dev": "0.0.1-alpha.2",
|
"@sharpen/sharp-libvips-dev": "0.0.1-alpha.2",
|
||||||
|
|||||||
@@ -154,7 +154,6 @@
|
|||||||
'OTHER_LDFLAGS': [
|
'OTHER_LDFLAGS': [
|
||||||
# Ensure runtime linking is relative to sharp.node
|
# Ensure runtime linking is relative to sharp.node
|
||||||
'-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
|
'-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
|
||||||
'-Wl,-rpath,\'@loader_path/../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\'',
|
|
||||||
'-Wl,-rpath,\'@loader_path/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
|
'-Wl,-rpath,\'@loader_path/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -175,7 +174,6 @@
|
|||||||
'-Wl,-s',
|
'-Wl,-s',
|
||||||
'-Wl,--disable-new-dtags',
|
'-Wl,--disable-new-dtags',
|
||||||
'-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
|
'-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
|
||||||
'-Wl,-rpath=\'$$ORIGIN/../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\'',
|
|
||||||
'-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
|
'-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user