diff --git a/itk_wasm_env.bash b/itk_wasm_env.bash index 512e1688b..ff9e7e8ca 100755 --- a/itk_wasm_env.bash +++ b/itk_wasm_env.bash @@ -17,7 +17,7 @@ export ITK_WASM_DCMTK_REPOSITORY=${ITK_WASM_DCMTK_REPOSITORY:-"https://github.co export ITK_WASM_DCMTK_GIT_TAG=${ITK_WASM_DCMTK_GIT_TAG:-"2fe4dacbe9c343dba350fcff6eab365241636623"} export ITK_WASM_ITK_REPOSITORY=${ITK_WASM_ITK_REPOSITORY:-"https://github.com/thewtex/ITK"} -export ITK_WASM_ITK_BRANCH=${ITK_WASM_ITK_BRANCH:-"itkwasm-2025-02-21-0dd02ac9f-1"} +export ITK_WASM_ITK_BRANCH=${ITK_WASM_ITK_BRANCH:-"itkwasm-2025-03-19-25d3162371"} export ITK_WASM_NATIVE_WORKSPACE=${ITK_WASM_NATIVE_WORKSPACE:-$(pwd)/native} diff --git a/packages/core/typescript/itk-wasm/package.json b/packages/core/typescript/itk-wasm/package.json index 5a27dfd8a..9ecfe0db4 100644 --- a/packages/core/typescript/itk-wasm/package.json +++ b/packages/core/typescript/itk-wasm/package.json @@ -42,6 +42,8 @@ "test:testPipelines": "pnpm test:buildTestPipelines:emscripten && pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines", "test:buildTestPipelines:emscripten:debug": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest-debug -b emscripten-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", "test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build", + "test:buildTestPipelines:emscriptenThreads:debug": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest-threads-debug -b emscripten-threads-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", + "test:buildTestPipelines:emscriptenThreads": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest-threads -b emscripten-threads-build -s ./test/pipelines build", "test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build", "test:buildTestPipelines:wasi:debug": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest-debug -b wasi-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug", "test:runTestPipelines": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines run -r wasmtime stdout-stderr-pipeline/stdout-stderr-test.wasi.wasm", diff --git a/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js b/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js index 880bea796..5d81cfe2f 100644 --- a/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js +++ b/packages/core/typescript/itk-wasm/src/cli/default-image-tag.js @@ -1,2 +1,2 @@ -const defaultImageTag = '20250311-f4c27be3' +const defaultImageTag = '20250319-964fe20b' export default defaultImageTag diff --git a/src/docker/itk-wasm-base/build.sh b/src/docker/itk-wasm-base/build.sh index 533b9b6a9..d4c6cef91 100755 --- a/src/docker/itk-wasm-base/build.sh +++ b/src/docker/itk-wasm-base/build.sh @@ -70,6 +70,7 @@ $exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:latest-threads-$host_a --build-arg IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Release \ + --build-arg VERSION=latest-threads \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ @@ -81,7 +82,7 @@ if $version_tag; then --build-arg IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Release \ - --build-arg VERSION=${TAG} \ + --build-arg VERSION=${TAG}-threads \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ @@ -125,6 +126,7 @@ if $debug; then --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg USE_DCMTK=OFF \ + --build-arg VERSION=latest-debug \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ @@ -150,6 +152,7 @@ if $debug; then --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg USE_DCMTK=OFF \ + --build-arg VERSION=${TAG}-threads-debug \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ diff --git a/src/docker/itk-wasm/build.sh b/src/docker/itk-wasm/build.sh index bb3d7d2ee..6d363edae 100755 --- a/src/docker/itk-wasm/build.sh +++ b/src/docker/itk-wasm/build.sh @@ -65,6 +65,7 @@ fi $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:latest-threads-$host_arch \ --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg HOST_ARCH=$host_arch \ + --build-arg VERSION=latest-threads \ --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg BASE_TAG=latest-threads-$host_arch \ @@ -79,7 +80,7 @@ if $version_tag; then --build-arg CMAKE_BUILD_TYPE=Release \ --build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \ --build-arg BASE_TAG=${TAG}-threads-$host_arch \ - --build-arg VERSION=${TAG} \ + --build-arg VERSION=${TAG}-threads \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ @@ -117,6 +118,7 @@ if $debug; then --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Debug \ + --build-arg VERSION=latest-debug \ --build-arg BASE_TAG=latest-debug-$host_arch \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ @@ -139,6 +141,7 @@ if $debug; then --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Debug \ --build-arg BASE_TAG=latest-threads-debug-$host_arch \ + --build-arg VERSION=latest-threads-debug \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \ --build-arg BUILD_DATE=${BUILD_DATE} \ @@ -148,7 +151,7 @@ if $debug; then --build-arg IMAGE=quay.io/itkwasm/emscripten \ --build-arg HOST_ARCH=$host_arch \ --build-arg CMAKE_BUILD_TYPE=Debug \ - --build-arg VERSION=${TAG}-debug \ + --build-arg VERSION=${TAG}-threads-debug \ --build-arg BASE_TAG=${TAG}-threads-debug-$host_arch \ --build-arg VCS_REF=${VCS_REF} \ --build-arg VCS_URL=${VCS_URL} \