Skip to content

Commit daf4d4d

Browse files
thewtexthewtex
authored
Merge pull request #1353 from thewtex/itk-5.4.3
itk 5.4.3
2 parents 46883fe + 4552658 commit daf4d4d

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

‎itk_wasm_env.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export ITK_WASM_DCMTK_REPOSITORY=${ITK_WASM_DCMTK_REPOSITORY:-"https://github.co
1717
export ITK_WASM_DCMTK_GIT_TAG=${ITK_WASM_DCMTK_GIT_TAG:-"2fe4dacbe9c343dba350fcff6eab365241636623"}
1818

1919
export ITK_WASM_ITK_REPOSITORY=${ITK_WASM_ITK_REPOSITORY:-"https://github.com/thewtex/ITK"}
20-
export ITK_WASM_ITK_BRANCH=${ITK_WASM_ITK_BRANCH:-"itkwasm-2025-02-21-0dd02ac9f-1"}
20+
export ITK_WASM_ITK_BRANCH=${ITK_WASM_ITK_BRANCH:-"itkwasm-2025-03-19-25d3162371"}
2121

2222
export ITK_WASM_NATIVE_WORKSPACE=${ITK_WASM_NATIVE_WORKSPACE:-$(pwd)/native}
2323

‎packages/core/typescript/itk-wasm/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
"test:testPipelines": "pnpm test:buildTestPipelines:emscripten && pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines",
4343
"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",
4444
"test:buildTestPipelines:emscripten": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build",
45+
"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",
46+
"test:buildTestPipelines:emscriptenThreads": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest-threads -b emscripten-threads-build -s ./test/pipelines build",
4547
"test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build",
4648
"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",
4749
"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",

‎packages/core/typescript/itk-wasm/src/cli/default-image-tag.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
const defaultImageTag = '20250311-f4c27be3'
1+
const defaultImageTag = '20250319-964fe20b'
22
export default defaultImageTag

‎src/docker/itk-wasm-base/build.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ $exe $build_cmd $tag_flag quay.io/itkwasm/emscripten-base:latest-threads-$host_a
7070
--build-arg IMAGE=quay.io/itkwasm/emscripten-base \
7171
--build-arg HOST_ARCH=$host_arch \
7272
--build-arg CMAKE_BUILD_TYPE=Release \
73+
--build-arg VERSION=latest-threads \
7374
--build-arg VCS_REF=${VCS_REF} \
7475
--build-arg VCS_URL=${VCS_URL} \
7576
--build-arg BUILD_DATE=${BUILD_DATE} \
@@ -81,7 +82,7 @@ if $version_tag; then
8182
--build-arg IMAGE=quay.io/itkwasm/emscripten-base \
8283
--build-arg HOST_ARCH=$host_arch \
8384
--build-arg CMAKE_BUILD_TYPE=Release \
84-
--build-arg VERSION=${TAG} \
85+
--build-arg VERSION=${TAG}-threads \
8586
--build-arg VCS_REF=${VCS_REF} \
8687
--build-arg VCS_URL=${VCS_URL} \
8788
--build-arg BUILD_DATE=${BUILD_DATE} \
@@ -125,6 +126,7 @@ if $debug; then
125126
--build-arg HOST_ARCH=$host_arch \
126127
--build-arg CMAKE_BUILD_TYPE=Debug \
127128
--build-arg USE_DCMTK=OFF \
129+
--build-arg VERSION=latest-debug \
128130
--build-arg VCS_REF=${VCS_REF} \
129131
--build-arg VCS_URL=${VCS_URL} \
130132
--build-arg BUILD_DATE=${BUILD_DATE} \
@@ -150,6 +152,7 @@ if $debug; then
150152
--build-arg HOST_ARCH=$host_arch \
151153
--build-arg CMAKE_BUILD_TYPE=Debug \
152154
--build-arg USE_DCMTK=OFF \
155+
--build-arg VERSION=${TAG}-threads-debug \
153156
--build-arg VCS_REF=${VCS_REF} \
154157
--build-arg VCS_URL=${VCS_URL} \
155158
--build-arg BUILD_DATE=${BUILD_DATE} \

‎src/docker/itk-wasm/build.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ fi
6565
$exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:latest-threads-$host_arch \
6666
--build-arg IMAGE=quay.io/itkwasm/emscripten \
6767
--build-arg HOST_ARCH=$host_arch \
68+
--build-arg VERSION=latest-threads \
6869
--build-arg CMAKE_BUILD_TYPE=Release \
6970
--build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \
7071
--build-arg BASE_TAG=latest-threads-$host_arch \
@@ -79,7 +80,7 @@ if $version_tag; then
7980
--build-arg CMAKE_BUILD_TYPE=Release \
8081
--build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \
8182
--build-arg BASE_TAG=${TAG}-threads-$host_arch \
82-
--build-arg VERSION=${TAG} \
83+
--build-arg VERSION=${TAG}-threads \
8384
--build-arg VCS_REF=${VCS_REF} \
8485
--build-arg VCS_URL=${VCS_URL} \
8586
--build-arg BUILD_DATE=${BUILD_DATE} \
@@ -117,6 +118,7 @@ if $debug; then
117118
--build-arg IMAGE=quay.io/itkwasm/emscripten \
118119
--build-arg HOST_ARCH=$host_arch \
119120
--build-arg CMAKE_BUILD_TYPE=Debug \
121+
--build-arg VERSION=latest-debug \
120122
--build-arg BASE_TAG=latest-debug-$host_arch \
121123
--build-arg VCS_REF=${VCS_REF} \
122124
--build-arg VCS_URL=${VCS_URL} \
@@ -139,6 +141,7 @@ if $debug; then
139141
--build-arg HOST_ARCH=$host_arch \
140142
--build-arg CMAKE_BUILD_TYPE=Debug \
141143
--build-arg BASE_TAG=latest-threads-debug-$host_arch \
144+
--build-arg VERSION=latest-threads-debug \
142145
--build-arg VCS_REF=${VCS_REF} \
143146
--build-arg VCS_URL=${VCS_URL} \
144147
--build-arg BUILD_DATE=${BUILD_DATE} \
@@ -148,7 +151,7 @@ if $debug; then
148151
--build-arg IMAGE=quay.io/itkwasm/emscripten \
149152
--build-arg HOST_ARCH=$host_arch \
150153
--build-arg CMAKE_BUILD_TYPE=Debug \
151-
--build-arg VERSION=${TAG}-debug \
154+
--build-arg VERSION=${TAG}-threads-debug \
152155
--build-arg BASE_TAG=${TAG}-threads-debug-$host_arch \
153156
--build-arg VCS_REF=${VCS_REF} \
154157
--build-arg VCS_URL=${VCS_URL} \

0 commit comments

Comments
 (0)