Merge branch 'master' of github.com:esmBot/esmBot

This commit is contained in:
Essem 2022-11-10 23:15:44 -06:00
commit 6f35578451
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
3 changed files with 11 additions and 30 deletions

View file

@ -26,36 +26,15 @@ jobs:
- name: Build
run: pnpm install --config.strict-peer-dependencies=false && pnpm run build
win64:
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Setup Scoop
uses: MinoruSekine/setup-scoop@v1
- name: Setup Node.js environment
uses: actions/setup-node@v2.1.2
- name: Setup pnpm
uses: pnpm/action-setup@v2.2.2
with:
version: 7
- name: Install Dependencies
run: scoop install libvips imagemagick
- name: Build
run: $PNPM_HOME/pnpm install --config.strict-peer-dependencies=false && $PNPM_HOME/pnpm run build
darwin:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Setup Node.js environment
uses: actions/setup-node@v2.1.2
- name: Setup pnpm
uses: pnpm/action-setup@v2.2.2
with:
version: 7
uses: actions/checkout@v2
- name: Install dependencies
run: brew install imagemagick vips
run: |
brew install imagemagick vips node pnpm npm
pnpm install --config.strict-peer-dependencies=false
- name: Build
run: pnpm install --config.strict-peer-dependencies=false && pnpm run build
run: pnpm run build

View file

@ -3,6 +3,8 @@ on:
push:
branches:
- master
paths:
- 'docs/**'
jobs:
build:

View file

@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME} ${ImageMagick_LIBRARIES})
pkg_check_modules(VIPS REQUIRED vips-cpp)
include_directories(${VIPS_INCLUDE_DIRS})
link_directories(${VIPS_LIBRARY_DIRS})
target_link_libraries(${PROJECT_NAME} ${VIPS_LIBRARIES})
target_link_libraries(${PROJECT_NAME} ${VIPS_LDFLAGS})
if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
# Generate node.lib