From 70b6c5b4391ef6c028b8aa063a5f8a191fb94ac4 Mon Sep 17 00:00:00 2001 From: Julien Tierny Date: Thu, 5 Dec 2024 13:04:05 +0100 Subject: [PATCH 1/4] [ci] macos upgrades --- .github/workflows/headless.yml | 19 +++++++++++++------ .github/workflows/package.yml | 20 ++++++++++++++------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.github/workflows/headless.yml b/.github/workflows/headless.yml index 069262823..c6b2b1d4d 100644 --- 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 @@ -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 index 52f150e36..8e5e24255 100644 --- 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 From 9b417500f21e81e0241546bd75c1c35f5810ca3b Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Fri, 6 Dec 2024 07:52:20 +0100 Subject: [PATCH 2/4] [ci] macos headless, downgrading python --- .github/workflows/headless.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/headless.yml b/.github/workflows/headless.yml index c6b2b1d4d..73d931bbf 100644 --- a/.github/workflows/headless.yml +++ b/.github/workflows/headless.yml @@ -88,7 +88,7 @@ jobs: - name: Install macOS dependencies run: | # ParaView dependencies - brew reinstall python + brew reinstall python:3.12 brew install --cask xquartz brew install ninja open-mpi From b8ebf48fdb21a8d49c78eec7a28cb93f23327396 Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Fri, 6 Dec 2024 07:58:09 +0100 Subject: [PATCH 3/4] [ci] macos headless, disabling mpi (python issue) --- .github/workflows/headless.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/headless.yml b/.github/workflows/headless.yml index 73d931bbf..076204ef4 100644 --- a/.github/workflows/headless.yml +++ b/.github/workflows/headless.yml @@ -88,16 +88,16 @@ jobs: - name: Install macOS dependencies run: | # ParaView dependencies - brew reinstall python:3.12 + 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 From 89f83f447fb6e1a13fbe2e04ed5a0a3bc06fe850 Mon Sep 17 00:00:00 2001 From: Julien J Tierny Date: Fri, 6 Dec 2024 08:08:50 +0100 Subject: [PATCH 4/4] [ci] macos typo --- .github/workflows/headless.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/headless.yml b/.github/workflows/headless.yml index 076204ef4..4b8b4d618 100644 --- a/.github/workflows/headless.yml +++ b/.github/workflows/headless.yml @@ -88,7 +88,7 @@ jobs: - name: Install macOS dependencies run: | # ParaView dependencies - brew reinstall python: + brew reinstall python brew install --cask xquartz brew install ninja