From f10a5ea6d40e61430c979b677f6c5c2cb6e5584e Mon Sep 17 00:00:00 2001
From: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:46:50 +0100
Subject: [PATCH 1/4] Update ci.yml

---
 .github/workflows/ci.yml | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a349fbeb..850a6265 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,29 +18,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-11, windows-2019]
+        os: [ubuntu-22.04, macos-13, windows-2022]
         sofa_branch: [master]
         python_version: ['3.8']
 
     steps:
-      - name: (Mac) Workaround for homebrew
-        shell: bash
-        if: runner.os == 'macOS'
-        run: |
-            rm -f /usr/local/bin/2to3
-            rm -f /usr/local/bin/idle3
-            rm -f /usr/local/bin/pydoc3
-            rm -f /usr/local/bin/python3
-            rm -f /usr/local/bin/python3-config
-            rm -f /usr/local/bin/2to3-3.11
-            rm -f /usr/local/bin/idle3.11
-            rm -f /usr/local/bin/pydoc3.11
-            rm -f /usr/local/bin/python3.11
-            rm -f /usr/local/bin/python3.11-config
-            
       - name: Setup SOFA and environment
         id: sofa
-        uses: sofa-framework/sofa-setup-action@v4
+        uses: sofa-framework/sofa-setup-action@v5
         with:
           sofa_root: ${{ github.workspace }}/sofa
           sofa_version: ${{ matrix.sofa_branch }}

From d6d5f86ad39c9a0f881901fbee46d074d44d39e7 Mon Sep 17 00:00:00 2001
From: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:53:06 +0100
Subject: [PATCH 2/4] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 850a6265..c13b85ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04, macos-13, windows-2022]
         sofa_branch: [master]
-        python_version: ['3.8']
+        python_version: ['3.10']
 
     steps:
       - name: Setup SOFA and environment

From f89a8bef93eba8f7568cc4202c00f27985a892e6 Mon Sep 17 00:00:00 2001
From: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:20:40 +0100
Subject: [PATCH 3/4] Update ci.yml

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c13b85ca..b10983d5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,6 +51,7 @@ jobs:
           cmake_options="-GNinja \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
+            -DCMAKE_MODLE_PATH=$pybind11_DIR \
             -DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \
             -DPYTHON_ROOT=$PYTHON_ROOT -DPython_ROOT=$PYTHON_ROOT \
             -DPYTHON_EXECUTABLE=$PYTHON_EXE -DPython_EXECUTABLE=$PYTHON_EXE"

From 35d8903261f0994d3d9e0d48fe7365cba6c93b6e Mon Sep 17 00:00:00 2001
From: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:51:25 +0100
Subject: [PATCH 4/4] Add pybind_DIR to CMAKE_PREFIX_PATH

---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b10983d5..3b8a0a6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,8 +51,7 @@ jobs:
           cmake_options="-GNinja \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
-            -DCMAKE_MODLE_PATH=$pybind11_DIR \
-            -DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \
+            -DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake:$pybind11_DIR" \
             -DPYTHON_ROOT=$PYTHON_ROOT -DPython_ROOT=$PYTHON_ROOT \
             -DPYTHON_EXECUTABLE=$PYTHON_EXE -DPython_EXECUTABLE=$PYTHON_EXE"
           if [ -e "$(command -v ccache)" ]; then