fix mac build (#324)

* only run docs CI when docs change

* remove broken windows CI, fix mac build
This commit is contained in:
samhza 2022-11-03 17:48:51 -04:00 committed by GitHub
parent 3795c85a7d
commit a3e3e4248c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 30 deletions

View file

@ -26,36 +26,15 @@ jobs:
- name: Build - name: Build
run: pnpm install --config.strict-peer-dependencies=false && pnpm run 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: darwin:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v2
- 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 - 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 - 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: push:
branches: branches:
- master - master
paths:
- 'docs/**'
jobs: jobs:
build: build:
@ -16,4 +18,4 @@ jobs:
uses: mhausenblas/mkdocs-deploy-gh-pages@master uses: mhausenblas/mkdocs-deploy-gh-pages@master
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REQUIREMENTS: docs/requirements.txt REQUIREMENTS: docs/requirements.txt

View file

@ -29,9 +29,9 @@ target_link_libraries(${PROJECT_NAME} ${ImageMagick_LIBRARIES})
pkg_check_modules(VIPS REQUIRED vips-cpp) pkg_check_modules(VIPS REQUIRED vips-cpp)
include_directories(${VIPS_INCLUDE_DIRS}) include_directories(${VIPS_INCLUDE_DIRS})
link_directories(${VIPS_LIBRARY_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) if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
# Generate node.lib # Generate node.lib
execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS}) execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
endif() endif()