Skip to content

dev build defaults #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewtex merged 12 commits into from
Dec 10, 2024
Merged

dev build defaults #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
23b0c54
docs(hacking-itk-wasm): run pull.sh script in quickstart
thewtex Dec 5, 2024
2bf0769
build(docker): use fully qualified images for monorepo package builds
thewtex Dec 5, 2024
00b24ef
build(pixi): fix transform-io test data reference path
thewtex Dec 5, 2024
4767f6f
ci(cypress): pull development docker containers
thewtex Dec 6, 2024
a3638d7
ci(cxx-python): fix commit reference
thewtex Dec 6, 2024
a497e5d
Merge branch 'main' into dev-build-defaults
thewtex Dec 9, 2024
53b191e
feat(pull.sh): tag images as localhost after pulling
thewtex Dec 9, 2024
1d78755
ci(examples): bump node-version to 22
thewtex Dec 9, 2024
a5f6e6a
ci(examples): pull docker images
thewtex Dec 9, 2024
40d6095
build(docker): use quay.io as repository name
thewtex Dec 10, 2024
edf1efd
ci(python-wasm): bump pyodide-version to 0.26.3
thewtex Dec 10, 2024
a85fd77
ci(python-wasm): bump node-version to 22
thewtex Dec 10, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/cxx-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
cxx-build-workflow:
# itk-wasm branch
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@l@6868c9879405def5d7532e0437b57e78cbe0b6ea
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@6868c9879405def5d7532e0437b57e78cbe0b6ea
with:
itk-module-deps: '[email protected]'
ctest-options: '-E itkPipelineTest'
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/cypress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
./src/docker/pull.sh --no-debug

- uses: actions/setup-node@v4
with:
node-version: '20'
Expand Down Expand Up @@ -111,6 +115,10 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
./src/docker/pull.sh --no-debug

- uses: actions/setup-node@v4
with:
node-version: '20'
Expand Down
34 changes: 27 additions & 7 deletions .github/workflows/examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
./src/docker/pull.sh --no-debug

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Install
uses: pnpm/action-setup@v4
Expand Down Expand Up @@ -60,7 +64,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '22'

- name: Install
run: |
Expand Down Expand Up @@ -125,7 +129,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '22'

- name: Install
run: |
Expand Down Expand Up @@ -158,9 +162,13 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
../../src/docker/pull.sh --no-debug

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Install
uses: pnpm/action-setup@v4
Expand Down Expand Up @@ -261,14 +269,18 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
../../src/docker/pull.sh --no-debug

- name: Install
uses: pnpm/action-setup@v4
with:
run_install: true

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Build dependencies
run: |
Expand Down Expand Up @@ -301,9 +313,13 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
../../src/docker/pull.sh --no-debug

- uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '22'

- name: Install
run: |
Expand All @@ -330,9 +346,13 @@ jobs:
large-packages: false
tool-cache: true

- name: Pull latest Docker images
run: |
./src/docker/pull.sh --no-debug

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Install
uses: pnpm/action-setup@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- main

env:
pyodide-version: 0.24.1
pyodide-version: 0.26.3

defaults:
run:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'

- name: Install
uses: pnpm/action-setup@v4
Expand Down
1 change: 1 addition & 0 deletions docs/development/hacking_itk_wasm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Install [Podman] and [Pixi], and

```sh
./src/docker/pull.sh
pixi run build
pixi run test
```
Expand Down
8 changes: 4 additions & 4 deletions examples/debugging/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"build": "npm run native-build && npm run emscripten-build-release && npm run emscripten-build-debug && npm run wasi-build-release && npm run wasi-build-debug",
"native-build": "cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Debug && cmake --build build/ --config Debug",
"native-debug-linux": "gdb --args ./build/DebugMe",
"emscripten-build-release": "itk-wasm -i itkwasm/emscripten:latest --build-dir emscripten-build-release build",
"emscripten-build-release": "itk-wasm -i quay.io/itkwasm/emscripten:latest --build-dir emscripten-build-release build",
"run-node-release": "node ./runEmscriptenNode.js ./emscripten-build-release/DebugMe",
"emscripten-build-debug": "itk-wasm -i itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
"emscripten-build-debug": "itk-wasm -i quay.io/itkwasm/emscripten:latest-debug --build-dir emscripten-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
"run-node-debug": "node ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
"wasi-build-release": "itk-wasm -i itkwasm/wasi:latest --build-dir wasi-build-release build",
"wasi-build-release": "itk-wasm -i quay.io/itkwasm/wasi:latest --build-dir wasi-build-release build",
"node-inspect": "node --inspect-brk ./runEmscriptenNode.js ./emscripten-build-debug/DebugMe",
"wasi-build-debug": "itk-wasm -i itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
"wasi-build-debug": "itk-wasm -i quay.io/itkwasm/wasi:latest-debug --build-dir wasi-build-debug build -- -DCMAKE_BUILD_TYPE=Debug",
"run-wasi-debug": "itk-wasm --build-dir wasi-build-debug run DebugMe.wasi.wasm",
"start": "http-server -o"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/inputs-outputs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "An itk-wasm pipeline example for inputs/outputs",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/inputs-outputs-example",
"python-package-name": "itkwasm-inputs-outputs-example",
"package-description": "An example that has non-trivial inputs and outputs.",
Expand Down
4 changes: 2 additions & 2 deletions examples/mean-squares-versor-registration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "Illustrate the use of the VersorRigid3DTransform for 3D image registration.",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/mean-squares-versor-registration-example",
"python-package-name": "itkwasm-mean-squares-versor-registration-example",
"package-description": "Example 3D versor transform registration with a mean-squares similarity metric",
Expand Down
4 changes: 2 additions & 2 deletions itk_wasm_env.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ export ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS=${ITK_WASM_DOWNSAMPLE_TEST_DATA_URLS:-
export ITK_WASM_MESH_IO_TEST_DATA_HASH=${ITK_WASM_MESH_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
export ITK_WASM_MESH_IO_TEST_DATA_URLS=${ITK_WASM_MESH_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}

export ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH=${ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
export ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS=${ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS:-$(cat packages/mesh-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
export ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH=${ITK_WASM_TRANSFORM_IO_TEST_DATA_HASH:-$(cat packages/transform-io/package.json | jq -e -r '."itk-wasm"."test-data-hash"')}
export ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS=${ITK_WASM_TRANSFORM_IO_TEST_DATA_URLS:-$(cat packages/transform-io/package.json | jq -e -r '."itk-wasm"."test-data-urls" | join(" ")')}
4 changes: 2 additions & 2 deletions packages/compare-images/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "@itk-wasm/compare-stringify build configuration",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"test-data-hash": "bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu",
"test-data-urls": [
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions packages/compare-meshes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "@itk-wasm/compare-meshes build configuration.",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"test-data-hash": "bafkreibsonywg3w3gscmookip3elsyydfsn2cbubk6dukatkmjgeguhiri",
"test-data-urls": [
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.178/compare-meshes-data.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions packages/compress-stringify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "@itk-wasm/compare-stringify build configuration.",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"test-data-hash": "bafkreiha6oye3fd5cxfadnua5r2jlkaco2xuyeek454d2ihiffsx7rauqe",
"test-data-urls": [
"https://placeholder"
Expand Down
14 changes: 7 additions & 7 deletions packages/core/typescript/itk-wasm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"test:node": "ava test/node/**/*.js",
"test:browser": "pnpm run test:browser:chrome && pnpm run test:browser:firefox",
"test:testPipelines": "pnpm test:buildTestPipelines:emscripten && pnpm test:buildTestPipelines:wasi && pnpm test:runTestPipelines",
"test:buildTestPipelines:emscripten:debug": "node src/itk-wasm-cli.js -i 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 itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines build",
"test:buildTestPipelines:wasi": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines build",
"test:buildTestPipelines:wasi:debug": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest-debug -b wasi-build -s ./test/pipelines build -- -DCMAKE_BUILD_TYPE=Debug",
"test:runTestPipelines": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines run -r wasmtime stdout-stderr-pipeline/stdout-stderr-test.wasi.wasm",
"test:bindgenTestPipelines:typescript": "node src/itk-wasm-cli.js -i itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines/ bindgen --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
"test:bindgenTestPipelines:python": "node src/itk-wasm-cli.js -i itkwasm/wasi:latest -b wasi-build -s ./test/pipelines/ bindgen --interface python --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
"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: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",
"test:bindgenTestPipelines:typescript": "node src/itk-wasm-cli.js -i quay.io/itkwasm/emscripten:latest -b emscripten-build -s ./test/pipelines/ bindgen --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
"test:bindgenTestPipelines:python": "node src/itk-wasm-cli.js -i quay.io/itkwasm/wasi:latest -b wasi-build -s ./test/pipelines/ bindgen --interface python --package-version 1.0.0 --package-name test-pipelines --package-description \"Exercise interface types for bindgen\"",
"test:browser:debug": "start-server-and-test start http-get://localhost:5180 cypress:open",
"test:cypress": "start-server-and-test start http-get://localhost:5180 cypress:run",
"test:browser:chrome": "start-server-and-test start http-get://localhost:5180 cypress:runChrome",
Expand Down
4 changes: 2 additions & 2 deletions packages/dicom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.119/dicom-test-data.tar.gz",
"https://w3s.link/ipfs/bafybeiby67winzvozowf4moqthwunuxxscssitnb6wahxv4ugvfxhu2vki/data.tar.gz"
],
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/dicom",
"python-package-name": "itkwasm-dicom",
"package-description": "Read and write files and images related to DICOM file format.",
Expand Down
4 changes: 2 additions & 2 deletions packages/downsample/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "Pipelines for downsampling images.",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"test-data-hash": "bafkreic7utwwa32sc7ekhouzdlnla4kffytphcwc7qwam5ndhixwjulydq",
"test-data-urls": [
"https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.163/itkwasm-downsample-test-data.tar.gz https://w3s.link/ipfs/bafybeifwebok64osjl2i3zc6rkn3izgon333wsjotqzqlxorkkvrbldjcy/data.tar.gz",
Expand Down
4 changes: 2 additions & 2 deletions packages/image-io/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"description": "Input and output for scientific and medical image file formats.",
"type": "module",
"itk-wasm": {
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/image-io",
"python-package-name": "itkwasm-image-io",
"package-description": "Input and output for scientific and medical image file formats.",
Expand Down
4 changes: 2 additions & 2 deletions packages/mesh-io/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"test-data-urls": [
"https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz"
],
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/mesh-io",
"python-package-name": "itkwasm-mesh-io",
"package-description": "Input and output for mesh file formats.",
Expand Down
8 changes: 4 additions & 4 deletions packages/transform-io/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"description": "scripts to generate @itk-wasm/transform-io itk-wasm artifacts.",
"type": "module",
"itk-wasm": {
"test-data-hash": "bafkreiahocrgb3p4xrjozr7cg5wdpdt6wp77kolnqyupae6awkplb5p4he",
"test-data-hash": "bafkreihranpzszz3q5bwgzsw6olqwh2e726wfnh4qblkjbng44yhqbfin4",
"test-data-urls": [
"https://bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq.ipfs.w3s.link/ipfs/bafybeian677gvnngces3pbcv6zpzauf3yn5bedxdis4smwzwh5xeewazuq/data.tar.gz"
"https://bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme.ipfs.w3s.link/ipfs/bafybeihn3n52vhja45ds3d4wsch3i77rej2oylorjgevt55w3aqirgxzme/data.tar.gz"
],
"emscripten-docker-image": "itkwasm/emscripten:latest",
"wasi-docker-image": "itkwasm/wasi:latest",
"emscripten-docker-image": "quay.io/itkwasm/emscripten:latest",
"wasi-docker-image": "quay.io/itkwasm/wasi:latest",
"typescript-package-name": "@itk-wasm/transform-io",
"python-package-name": "itkwasm-transform-io",
"package-description": "Input and output for scientific and medical coordinate transform file formats.",
Expand Down
Loading
Loading