Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@ on:

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@e885a99c2e34497c4c5c0c1428a269fb0aae7902
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.6
with:
warnings-to-ignore: "\"libcleaver.a.*has no symbols\" \"libitkcleaver.*has no symbols\""

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@e885a99c2e34497c4c5c0c1428a269fb0aae7902
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.6
with:
itk-wheel-tag: 'v5.4.5'
itk-python-package-tag: 'v5.4.5'
test-notebooks: false
secrets:
pypi_password: ${{ secrets.pypi_password }}
14 changes: 7 additions & 7 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ on:
jobs:
build-wasm:
name: "build-test-wasm"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@v5

- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '22'

- name: Install
run: |
Expand Down Expand Up @@ -59,14 +59,14 @@ jobs:
browser: firefox
start: npm start

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
path: wasm/typescript/cypress/screenshots

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: cypress-videos
path: wasm/typescript/cypress/videos
path: wasm/typescript/cypress/videos
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ if(DEFINED BUILD_TESTING)
else()
set(_itk_build_testing OFF) # Default
endif()
if(WASI OR EMSCRIPTEN)
# Cleaver lib vendored GTest incompatibility
set(BUILD_TESTING OFF CACHE BOOL "Build testing code" FORCE)
endif()
# Disable testing for the vendored Cleaver lib — its bundled googletest
Comment thread
hjmjohnson marked this conversation as resolved.
# (via CIBC-Internal/googletest ExternalProject) uses cmake_minimum_required
# < 3.5 which CMake >= 4.0 rejects. The ITK module has its own tests.
# Upstream fix: SCIInstitute/Cleaver#130
set(BUILD_TESTING OFF CACHE BOOL "Build testing code" FORCE)
if (CMAKE_CXX_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
endif()
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"type": "module",
"scripts": {
"build": "npm run build:emscripten && npm run build:wasi && npm run bindgen:typescript",
"build:emscripten": "itk-wasm -i itkwasm/emscripten:20230328-71e6501e build",
"build:emscripten:debug": "itk-wasm -i itkwasm/emscripten:20230328-71e6501e-debug build -- -DCMAKE_BUILD_TYPE:STRING=Debug",
"build:wasi": "itk-wasm -i itkwasm/wasi:20230328-71e6501e build",
"build:wasi:debug": "itk-wasm -i itkwasm/wasi:20230328-71e6501e-debug build -- -DCMAKE_BUILD_TYPE:STRING=Debug",
"build:emscripten": "itk-wasm -i itkwasm/emscripten:20250619-3165ade4 build",
"build:emscripten:debug": "itk-wasm -i itkwasm/emscripten:20250619-3165ade4-debug build -- -DCMAKE_BUILD_TYPE:STRING=Debug",
"build:wasi": "itk-wasm -i itkwasm/wasi:20250619-3165ade4 build",
"build:wasi:debug": "itk-wasm -i itkwasm/wasi:20250619-3165ade4-debug build -- -DCMAKE_BUILD_TYPE:STRING=Debug",
"bindgen:typescript": "itk-wasm -b emscripten-build bindgen --output-dir wasm/typescript --package-name @itk-wasm/cleaver --package-description \"The Cleaver multimaterial tetrahedral meshing tool.\" --repository 'https://github.com/SCIInstitute/Cleaver'",
"test": "npm run test:wasi",
"test:wasi": "itk-wasm test --test-dir wasm",
"clean": "git clean -fdx -e node_modules"
},
"license": "Apache-2.0",
"devDependencies": {
"itk-wasm": "^1.0.0-b.91"
"itk-wasm": "^1.0.0-b.176"
}
}
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"

[project]
name = "itk-cleaver"
version = "1.4.0"
version = "1.4.1"
description = "An ITK interface to the Cleaver multi-material tetrahedral meshing library"
readme = "README.rst"
license = {file = "LICENSE"}
Expand Down Expand Up @@ -34,7 +34,7 @@ classifiers = [
"Topic :: Scientific/Engineering :: Medical Science Apps.",
"Topic :: Software Development :: Libraries",
]
requires-python = ">=3.8"
requires-python = ">=3.10"
dependencies = [
"itk == 5.4.*",
]
Expand Down
Loading