Skip to content

Commit

Permalink
Added zlib1.dll
Browse files Browse the repository at this point in the history
Removed Windows x86 support
  • Loading branch information
DennisGerritsenCloudflight committed Oct 18, 2024
1 parent 2c167f9 commit cc10ca4
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 20 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/build-lib-c-binaries.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name: Build lib C binaries

on:
pull_request:
types: [opened, reopened, synchronize]
paths:
- '**/platform/**/Dockerfile'
workflow_dispatch:

jobs:
build:
Expand All @@ -21,9 +18,6 @@ jobs:
- os: windows-latest
platform: win32-x64
arch: x64
- os: windows-latest
platform: win32-ia32
arch: x86

steps:
- name: Checkout repository
Expand Down Expand Up @@ -57,7 +51,8 @@ jobs:
docker cp $env:source/bin/libde265.dll $env:destination/bin/libde265.dll
docker cp $env:source/bin/libx265.dll $env:destination/bin/libx265.dll
docker cp $env:source/bin/libpng16.dll $env:destination/bin/libpng16.dll
docker cp $env:source/bin/zlib1.dll $env:destination/bin/zlib1.dll
# Copy lib files
docker cp $env:source/lib/heif.lib $env:destination/lib/heif.lib
docker cp $env:source/lib/turbojpeg.lib $env:destination/lib/turbojpeg.lib
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/build-node-artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: Build Node.js Artifact

on:
pull_request:
types: [opened, reopened, synchronize]
paths:
- 'src/lib.cc'
- '.github/workflows/build-node-artifacts.yml'
- '**/npm/**/Dockerfile'
workflow_dispatch:

jobs:
build:
Expand All @@ -22,8 +17,6 @@ jobs:
platform: darwin-x64
- os: windows-latest
platform: win32-x64
- os: windows-latest
platform: win32-ia32

steps:
- name: Checkout repository
Expand Down Expand Up @@ -73,6 +66,8 @@ jobs:
cp platform/${{ matrix.PLATFORM }}/bin/libde265.dll ./release/${{ matrix.PLATFORM }}/lib/libde265.dll
cp platform/${{ matrix.PLATFORM }}/bin/libx265.dll ./release/${{ matrix.PLATFORM }}/lib/libx265.dll
cp platform/${{ matrix.PLATFORM }}/bin/libpng16.dll ./release/${{ matrix.PLATFORM }}/lib/libpng16.dll
cp platform/${{ matrix.PLATFORM }}/bin/zlib1.dll ./release/${{ matrix.PLATFORM }}/lib/zlib1.dll
cp -r npm/${{ matrix.PLATFORM }}/* ./release/${{ matrix.PLATFORM }}
- name: Run tests
if: "!contains(matrix.os, 'ubuntu')"
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ node_modules/
dist
temp
.vscode
npm/*/lib
npm/*/lib
/.idea/
2 changes: 1 addition & 1 deletion npm/win32-x64/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage": "https://github.com/MyUnisoft/heif-converter",
"repository": {
"type": "git",
"url": "git+https://github.com/MyUnisoft/heif-converter.git",
"url": "git+https://github.com/cloudflightio/heif-converter",
"directory": "npm/win32-x64"
},
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@myunisoft/heif-converter",
"description": "Bindings for the libheif C API to convert an image in Node.js",
"description": "Bindings for the libheif C API to convert an image in Node.js, including Windows fix regarding zlib missing",
"version": "0.2.2",
"keywords": [
"heif",
Expand All @@ -17,7 +17,7 @@
"gypfile": true,
"repository": {
"type": "git",
"url": "https://github.com/MyUnisoft/heif-converter.git"
"url": "https://github.com/cloudflightio/heif-converter"
},
"bugs": {
"url": "https://github.com/MyUnisoft/heif-converter/issues"
Expand Down
Binary file added platform/win32-x64/bin/zlib1.dll
Binary file not shown.

0 comments on commit cc10ca4

Please sign in to comment.