Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into ci

topology-tool-kit · Sep 16, 2024 · 59f5923 · 59f5923
2 parents 457c01b + d0dd966
commit 59f5923
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -268,6 +268,8 @@ jobs:
       matrix:
         os: [macos-12, macos-14]
     if: ${{ github.repository_owner == 'topology-tool-kit' || !contains(github.ref, 'heads') }}
+    env:
+      DYLD_LIBRARY_PATH: /usr/local/lib
 
     steps:
     - uses: actions/checkout@v4
@@ -305,9 +307,7 @@ jobs:
             https://github.com/${{ env.PV_REPO }}/releases/download/${{ env.PV_TAG }}/ttk-paraview-headless-${{ matrix.os }}-arm64.tar.gz
         fi
 
-    # NOTE: pvpython is broken on macos-14, but not on macos-12 (?)
     - name: Install ParaView
-      continue-on-error: true
       run: |
         tar xzf ttk-paraview-headless.tar.gz
         sudo cp -r ttk-paraview/* /usr/local
@@ -356,7 +356,6 @@ jobs:
         echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
 
     - name: Run TTK tests
-      continue-on-error: true
       uses: ./.github/actions/test-ttk-unix
 
     - uses: actions/checkout@v4
@@ -389,7 +388,6 @@ jobs:
         retention-days: 10
 
     - name: Run ttk-data Python scripts
-      continue-on-error: true
       run: |
         cd ttk-data
         # remove buggy example

diff --git a/paraview/patch/headless.yml b/paraview/patch/headless.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
       name: Checkout TTK-ParaView source code
@@ -232,6 +232,15 @@ jobs:
         file: ttk-paraview-headless-ubuntu-22.04/ttk-paraview.deb
         asset_name: ttk-paraview-headless-ubuntu-22.04.deb
 
+    - name: Upload Ubuntu Noble Numbat .deb as Release Asset
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref }}
+        file: ttk-paraview-headless-ubuntu-24.04/ttk-paraview.deb
+        asset_name: ttk-paraview-headless-ubuntu-24.04.deb
+
+
     - name: Upload MacOS 14 (arm64) .tar.gz as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:

diff --git a/paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch b/paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch
@@ -0,0 +1,13 @@
+--- a/Remoting/Core/vtkPVFileInformation.cxx	2018-04-06 22:03:33.000000000 +0200
++++ b/Remoting/Core/vtkPVFileInformation.cxx	2018-05-20 07:11:10.114020235 +0200
+@@ -1226,6 +1222,11 @@
+     resource_dir = vtksys::SystemTools::CollapseFullPath(resource_dir);
+   }
+
++  vtkProcessModule* pm = vtkProcessModule::GetProcessModule();
++
++  if((pm)&&(prefixes.size()))
++    resource_dir = pm->GetSelfDir() + "/../" + prefixes[0];
++
+   return resource_dir;
+ }
diff --git a/paraview/patch/patch-paraview-5.13.0.sh b/paraview/patch/patch-paraview-5.13.0.sh
@@ -74,9 +74,8 @@ mkdir -p TTK/Data/
 cp ${PATCH_DIR}/data/* TTK/Data/
 cp TTK/Data/*pvsm Qt/ApplicationComponents/Resources/ExampleVisualizations/
 cp TTK/Data/*png Qt/ApplicationComponents/Resources/Thumbnails/
-# the patch below makes the build fail under macos-14...
-#$PATCH_BIN Remoting/Core/vtkPVFileInformation.cxx \
-#  < "${PATCH_DIR}/paraview-5.8.0-vtkPVFileInformation.cxx.patch"
+$PATCH_BIN Remoting/Core/vtkPVFileInformation.cxx \
+  < "${PATCH_DIR}/paraview-5.13.0-vtkPVFileInformation.cxx.patch"
 $PATCH_BIN Qt/ApplicationComponents/Resources/UI/pqExampleVisualizationsDialog.ui \
   < "${PATCH_DIR}/paraview-5.13.0-ApplicationComponents.patch"
 $PATCH_BIN Qt/ApplicationComponents/pqExampleVisualizationsDialog.cxx \