Skip to content

Commit 053a545

Browse files
committed
Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into path-mapping-preprocessing
2 parents ebc62ec + 1e9a425 commit 053a545

File tree

187 files changed

+77963
-54564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+77963
-54564
lines changed

.github/actions/test-ttk-unix/action.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,18 @@ runs:
2525
- name: Test Python example
2626
shell: bash
2727
run: |
28-
cd $GITHUB_WORKSPACE/examples/python
29-
python3 example.py ../data/inputData.vtu
28+
if [ "${{ matrix.os }}" != "macos-13" ] && [ "${{ matrix.os }}" != "macos-14" ] && [ "${{ matrix.os }}" != "macos-15" ]; then
29+
cd $GITHUB_WORKSPACE/examples/python
30+
python3 example.py ../data/inputData.vtu
31+
fi
3032
3133
- name: Test pvpython example
3234
shell: bash
3335
run: |
34-
cd $GITHUB_WORKSPACE/examples/pvpython
35-
pvpython example.py ../data/inputData.vtu
36+
if [ "${{ matrix.os }}" != "macos-13" ] && [ "${{ matrix.os }}" != "macos-14" ] && [ "${{ matrix.os }}" != "macos-15" ]; then
37+
cd $GITHUB_WORKSPACE/examples/pvpython
38+
pvpython example.py ../data/inputData.vtu
39+
fi
3640
3741
- name: Test standalone
3842
shell: bash

.github/workflows/check.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ concurrency:
2222
cancel-in-progress: true
2323

2424
env:
25-
PV_TAG: v5.12.0-headless
25+
PV_TAG: v5.13.0-headless
2626
PV_REPO: topology-tool-kit/ttk-paraview
2727

2828

@@ -35,7 +35,7 @@ jobs:
3535
check-formatting:
3636
runs-on: ubuntu-22.04
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939

4040
- name: Install latest clang-format
4141
run: |
@@ -97,7 +97,7 @@ jobs:
9797
CMAKE_EXPORT_COMPILE_COMMANDS: ON
9898

9999
steps:
100-
- uses: actions/checkout@v3
100+
- uses: actions/checkout@v4
101101

102102
- name: Install Ubuntu dependencies
103103
run: |
@@ -161,6 +161,7 @@ jobs:
161161
162162
- name: Check Doxygen documentation warnings
163163
if: matrix.config.dox
164+
continue-on-error: true
164165
run: |
165166
cd build
166167
! cmake --build . --target doc |& grep warning
@@ -182,7 +183,7 @@ jobs:
182183
CMAKE_EXPORT_COMPILE_COMMANDS: ON
183184

184185
steps:
185-
- uses: actions/checkout@v3
186+
- uses: actions/checkout@v4
186187

187188
- name: Install Ubuntu dependencies
188189
run: |

0 commit comments

Comments
 (0)