Skip to content

Commit

Permalink
Bump VTK for WASM fixes (f3d-app#1453)
Browse files Browse the repository at this point in the history
  • Loading branch information
Meakk authored Jun 5, 2024
1 parent ad897fb commit b3c030f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 42 deletions.

This file was deleted.

10 changes: 1 addition & 9 deletions .github/actions/vtk-webassembly-install-dep/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
uses: actions/cache@v4
with:
path: dependencies/vtk_install
key: vtk-webassembly-${{env.VTK_SHA_OR_TAG}}-7
key: vtk-webassembly-${{env.VTK_SHA_OR_TAG}}-1

- name: Setup VTK
if: steps.cache-vtk.outputs.cache-hit != 'true'
Expand All @@ -52,14 +52,6 @@ runs:
path: './dependencies/vtk'
ref: ${{env.VTK_SHA_OR_TAG}}

# Note that it's a bug in VTK and this step should be removed when fixed
# See https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11178
- name: Patch js file install
if: steps.cache-vtk.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/vtk
shell: bash
run: patch -p1 < $GITHUB_ACTION_PATH/0001-fix-js-install.patch

- name: Configure VTK
if: steps.cache-vtk.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/vtk_build
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/vtk_commit_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
63a4642a4274edb24b0e7ae8b73fd19b3f4aaa33
7e954a92fba020b160a07420403248f6be87f2b0
1 change: 1 addition & 0 deletions doc/dev/BUILD_WASM.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ docker pull dockcross/web-wasm:20240529-0dade71
```

Clone VTK and F3D, it will be assumed that the source code is located in `$VTK_DIR` and `$F3D_DIR` variables in the next steps of this guide.
It's recommended to use VTK commit `7e954a92fba020b160a07420403248f6be87f2b0` which has been tested to work properly.

## Building VTK

Expand Down

0 comments on commit b3c030f

Please sign in to comment.