From b6cebd2abccaf48f464eae5dd31f734df56a6bbd Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Thu, 12 Sep 2024 14:38:35 +0200 Subject: [PATCH 1/5] [ci-pv513] Enabling ubuntu-22.04 on pv513 headless --- paraview/patch/headless.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/paraview/patch/headless.yml b/paraview/patch/headless.yml index 4d0e2b0cf3..0692628233 100644 --- 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: From bee3ba9183ac80e437dcf0110deaabd7ce76e108 Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Thu, 12 Sep 2024 16:36:52 +0200 Subject: [PATCH 2/5] [pv513] Final patchset fix --- .../paraview-5.13.0-vtkPVFileInformation.cxx.patch | 13 +++++++++++++ paraview/patch/patch-paraview-5.13.0.sh | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch diff --git a/paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch b/paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch new file mode 100644 index 0000000000..57816fc041 --- /dev/null +++ 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 index 0c3ac5a247..f6b792e9dc 100755 --- 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 \ From 62c905a73ac85deeadcc9806218e3a766b9b08f8 Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Sun, 15 Sep 2024 09:34:50 +0200 Subject: [PATCH 3/5] [ci-macos-14] trying to fix pvpython --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e4323ff04b..e5ed2d2fa7 100644 --- 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 From 099a56feb4a8959e4fee51339f0cfd97f3e426a8 Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Sun, 15 Sep 2024 09:36:43 +0200 Subject: [PATCH 4/5] [ci-macos-14] Fixing pvpython --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5ed2d2fa7..6f7f80178a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -268,7 +268,7 @@ jobs: matrix: os: [macos-12, macos-14] if: ${{ github.repository_owner == 'topology-tool-kit' || !contains(github.ref, 'heads') }} - env: + env: DYLD_LIBRARY_PATH: /usr/local/lib steps: From 110975e1b20ede3ae7d66a4d1a2f474eb3a24130 Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Sun, 15 Sep 2024 09:54:20 +0200 Subject: [PATCH 5/5] [ci-macos-14] Resuming pvpython enforcement --- .github/workflows/test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f7f80178a..c0c9048c6f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -307,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 @@ -358,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 @@ -391,7 +388,6 @@ jobs: retention-days: 10 - name: Run ttk-data Python scripts - continue-on-error: true run: | cd ttk-data # remove buggy example