Merge branch '5.13.0' of https://github.com/topology-tool-kit/ttk-par…

…aview into 5.13.0
topology-tool-kit · Dec 13, 2024 · 5fa37c5 · 5fa37c5
2 parents bf1f5ec + 69c1792
commit 5fa37c5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/.github/workflows/headless.yml b/.github/workflows/headless.yml
@@ -72,7 +72,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14, macos-15]
     env:
       CCACHE_DIR: /Users/runner/work/ttk/.ccache
       CCACHE_MAXSIZE: 200M
@@ -90,14 +90,14 @@ jobs:
         # ParaView dependencies
         #brew reinstall python
         brew install --cask xquartz
-        brew install ninja open-mpi
+        brew install ninja 
 
     - name: Create & configure ParaView build directory
       run: |
         mkdir build && cd build
         cmake \
           -DCMAKE_BUILD_TYPE=Release \
-          -DPARAVIEW_USE_MPI=ON \
+          -DPARAVIEW_USE_MPI=OFF \
           -DPARAVIEW_USE_QT=OFF \
           -GNinja \
           $GITHUB_WORKSPACE
@@ -240,22 +240,29 @@ jobs:
         file: ttk-paraview-headless-ubuntu-24.04/ttk-paraview.deb
         asset_name: ttk-paraview-headless-ubuntu-24.04.deb
 
+    - name: Upload MacOS 15 .tar.gz as Release Asset
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref }}
+        file: ttk-paraview-headless-macos-15/ttk-paraview.tar.gz
+        asset_name: ttk-paraview-headless-macos-15.tar.gz
 
-    - name: Upload MacOS 14 (arm64) .tar.gz as Release Asset
+    - name: Upload MacOS 14 .tar.gz as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
         file: ttk-paraview-headless-macos-14/ttk-paraview.tar.gz
-        asset_name: ttk-paraview-headless-macos-14-arm64.tar.gz
+        asset_name: ttk-paraview-headless-macos-14.tar.gz
 
-    - name: Upload MacOS 12 .tar.gz as Release Asset
+    - name: Upload MacOS 13 .tar.gz as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ttk-paraview-headless-macos-12/ttk-paraview.tar.gz
-        asset_name: ttk-paraview-headless-macos-12.tar.gz
+        file: ttk-paraview-headless-macos-13/ttk-paraview.tar.gz
+        asset_name: ttk-paraview-headless-macos-13.tar.gz
 
 
     - name: Upload .exe as Release Asset

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -75,7 +75,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14, macos-15]
     steps:
     - uses: actions/checkout@v4
       name: Checkout TTK-ParaView source code
@@ -239,21 +239,29 @@ jobs:
         file: ttk-paraview-ubuntu-24.04/ttk-paraview.deb
         asset_name: ttk-paraview-$tag-ubuntu-24.04.deb
 
-    - name: Upload MacOS 14 (arm64) .tar.gz as Release Asset
+    - name: Upload MacOS 15 .tar.gz as Release Asset
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        tag: ${{ github.ref }}
+        file: ttk-paraview-macos-15/ttk-paraview.tar.gz
+        asset_name: ttk-paraview-$tag-macos-15.tar.gz
+
+    - name: Upload MacOS 14 .tar.gz as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
         file: ttk-paraview-macos-14/ttk-paraview.tar.gz
-        asset_name: ttk-paraview-$tag-macos-14-arm64.tar.gz
+        asset_name: ttk-paraview-$tag-macos-14.tar.gz
 
-    - name: Upload MacOS 12 .tar.gz as Release Asset
+    - name: Upload MacOS 13 .tar.gz as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ttk-paraview-macos-12/ttk-paraview.tar.gz
-        asset_name: ttk-paraview-$tag-macos-12.tar.gz
+        file: ttk-paraview-macos-13/ttk-paraview.tar.gz
+        asset_name: ttk-paraview-$tag-macos-13.tar.gz
 
     - name: Upload .exe as Release Asset
       uses: svenstaro/upload-release-action@v2