Skip to content

Commit 8d4e846

Browse files
committed
[ttk-paraview] updated ci
1 parent 1d8f7a1 commit 8d4e846

File tree

2 files changed

+17
-46
lines changed

2 files changed

+17
-46
lines changed

paraview/patch/headless.yml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
20+
os: [ubuntu-22.04, ubuntu-24.04]
2121
steps:
2222
- uses: actions/checkout@v4
2323
name: Checkout TTK-ParaView source code
@@ -41,6 +41,7 @@ jobs:
4141
-DCMAKE_INSTALL_PREFIX=/usr \
4242
-DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=lib/python3/dist-packages \
4343
-DPARAVIEW_USE_MPI=ON \
44+
-DPARAVIEW_USE_PYTHON=ON \
4445
-DPARAVIEW_USE_QT=OFF \
4546
-DVTK_USE_X=OFF \
4647
-DVTK_OPENGL_HAS_OSMESA=ON \
@@ -82,20 +83,13 @@ jobs:
8283

8384
- uses: actions/setup-python@v5
8485
with:
85-
python-version: '3.12'
86+
python-version: '3.13'
8687

8788
- name: Install macOS dependencies
8889
run: |
8990
# ParaView dependencies
9091
brew install --cask xquartz
91-
brew install llvm lld ninja open-mpi
92-
93-
- name: Set compilers as environment variables
94-
run: |
95-
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
96-
echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
97-
echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
98-
echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
92+
brew install ninja open-mpi
9993
10094
- name: Create & configure ParaView build directory
10195
run: |
@@ -122,14 +116,14 @@ jobs:
122116
cd build
123117
sudo cmake --build . --target install
124118
# pvpython does not embed the correct PYTHONPATH
125-
echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
119+
echo "PYTHONPATH=/usr/local/lib/python3.13/site-packages:$PYTHONPATH" >> $GITHUB_ENV
126120
127121
- name: Test Python imports
128122
run: |
129-
python3 -m vtk
130-
python3 -m paraview.simple
131-
pvpython -m vtk
132-
pvpython -m paraview.simple
123+
echo "import vtk" | python3
124+
echo "from paraview.simple import *" | python3
125+
echo "import vtk" | pvpython
126+
echo "from paraview.simple import *" | pvpython
133127
env:
134128
DYLD_LIBRARY_PATH: /usr/local/lib
135129

@@ -237,14 +231,6 @@ jobs:
237231
- name: Fetch all uploaded artifacts
238232
uses: actions/download-artifact@v4
239233

240-
- name: Upload Ubuntu Focal .deb as Release Asset
241-
uses: svenstaro/upload-release-action@v2
242-
with:
243-
repo_token: ${{ secrets.GITHUB_TOKEN }}
244-
tag: ${{ github.ref }}
245-
file: ttk-paraview-headless-ubuntu-20.04/ttk-paraview.deb
246-
asset_name: ttk-paraview-headless-ubuntu-20.04.deb
247-
248234
- name: Upload Ubuntu Jammy .deb as Release Asset
249235
uses: svenstaro/upload-release-action@v2
250236
with:

paraview/patch/package.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
21+
os: [ubuntu-22.04, ubuntu-24.04]
2222
steps:
2323
- uses: actions/checkout@v4
2424
name: Checkout TTK-ParaView source code
@@ -85,20 +85,13 @@ jobs:
8585

8686
- uses: actions/setup-python@v5
8787
with:
88-
python-version: '3.12'
88+
python-version: '3.13'
8989

9090
- name: Install macOS dependencies
9191
run: |
9292
# ParaView dependencies
9393
brew install --cask xquartz
94-
brew install llvm lld mesa glew qt@5 ninja
95-
96-
- name: Set compilers as environment variables
97-
run: |
98-
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
99-
echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
100-
echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
101-
echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
94+
brew install mesa glew qt@5 ninja
10295
10396
- name: Create & configure ParaView build directory
10497
run: |
@@ -124,14 +117,14 @@ jobs:
124117
cd build
125118
sudo cmake --build . --target install
126119
# pvpython does not embed the correct PYTHONPATH
127-
echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
120+
echo "PYTHONPATH=/usr/local/lib/python3.13/site-packages:$PYTHONPATH" >> $GITHUB_ENV
128121
129122
- name: Test Python imports
130123
run: |
131-
python3 -m vtk
132-
python3 -m paraview.simple
133-
pvpython -m vtk
134-
pvpython -m paraview.simple
124+
echo "import vtk" | python3
125+
echo "from paraview.simple import *" | python3
126+
echo "import vtk" | pvpython
127+
echo "from paraview.simple import *" | pvpython
135128
env:
136129
DYLD_LIBRARY_PATH: /usr/local/lib
137130

@@ -238,14 +231,6 @@ jobs:
238231
- name: Fetch all uploaded artifacts
239232
uses: actions/download-artifact@v4
240233

241-
- name: Upload Ubuntu Focal .deb as Release Asset
242-
uses: svenstaro/upload-release-action@v2
243-
with:
244-
repo_token: ${{ secrets.GITHUB_TOKEN }}
245-
tag: ${{ github.ref }}
246-
file: ttk-paraview-ubuntu-20.04/ttk-paraview.deb
247-
asset_name: ttk-paraview-$tag-ubuntu-20.04.deb
248-
249234
- name: Upload Ubuntu Jammy .deb as Release Asset
250235
uses: svenstaro/upload-release-action@v2
251236
with:

0 commit comments

Comments
 (0)