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

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 86da1f1..6c12681 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,29 +11,13 @@ 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, v22.12]
 
     steps:
-      # https://github.com/actions/runner-images/issues/6817
-      - name: (Mac) Workaround for homebrew # https://github.com/rancher-sandbox/lima-and-qemu/pull/20
-        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 771f467785c56204976cc46a4b80f187a7b5b3cf Mon Sep 17 00:00:00 2001
From: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:54:28 +0100
Subject: [PATCH 2/3] 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 6c12681..d74f49a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-13, windows-2022]
-        sofa_branch: [master, v22.12]
+        sofa_branch: [master, v23.12]
 
     steps:
       - name: Setup SOFA and environment

From 669b85d9c898ea135e2514656fc8a90573f5b078 Mon Sep 17 00:00:00 2001
From: Paul Baksic <30337881+bakpaul@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:52:15 +0100
Subject: [PATCH 3/3] Update ci.yml

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d74f49a..01632b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,12 +34,13 @@ jobs:
             sudo apt-get update
             sudo apt-get -qq install libcgal-dev
           elif [[ "$RUNNER_OS" == "macOS" ]]; then
+            rm /usr/local/bin/2to3
             brew install cgal
           elif [[ "$RUNNER_OS" == "Windows" ]]; then
             curl --output "${{ runner.temp }}/cgal_lib.zip" -L \
-                  "https://github.com/CGAL/cgal/releases/download/v5.3.1/CGAL-5.3.1-library.zip"
+                  "https://github.com/CGAL/cgal/releases/download/v5.4.1/CGAL-5.4.1.zip"
             curl --output "${{ runner.temp }}/cgal_dep.zip" -L \
-                  "https://github.com/CGAL/cgal/releases/download/v5.3.1/CGAL-5.3.1-win64-auxiliary-libraries-gmp-mpfr.zip"
+                  "https://github.com/CGAL/cgal/releases/download/v5.4.1/CGAL-5.4.1-win64-auxiliary-libraries-gmp-mpfr.zip"
             unzip -qq "${{ runner.temp }}/cgal_lib.zip" -d "${{ runner.temp }}/cgal_dir"
             unzip -qq "${{ runner.temp }}/cgal_dep.zip" -d "${{ runner.temp }}/cgal_dir"
             echo "CGAL_ROOT=${{ runner.temp }}/cgal_dir" | tee -a $GITHUB_ENV