From 2c3ed6a4d03875b744d9536c39967883d6f1dfe5 Mon Sep 17 00:00:00 2001
From: Pieter Pas <pieter.p.dev@outlook.com>
Date: Sat, 7 Dec 2024 22:08:04 +0100
Subject: [PATCH] [CI] Matlab builds

---
 .github/workflows/matlab.yml              | 13 ++++++++-----
 scripts/ci/build-matlab-windows.bat       |  2 +-
 scripts/ci/profiles/macos.profile         |  1 +
 scripts/ci/profiles/windows-amd64.profile |  1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/matlab.yml b/.github/workflows/matlab.yml
index fc778c616c..bd5adbb812 100644
--- a/.github/workflows/matlab.yml
+++ b/.github/workflows/matlab.yml
@@ -16,7 +16,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             name: glnxa64
-            matlab-version: 'R2021a'
+            matlab-release: 'R2021a'
             host: x86_64-bionic-linux-gnu
           - os: macos-14
             name: maca64
@@ -26,6 +26,7 @@ jobs:
             name: maci64
             matlab-release: 'R2021a'
             host: macos
+      fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -42,7 +43,7 @@ jobs:
       uses: matlab-actions/setup-matlab@64144ac4bb7c754f9ef7642f693671c873701c60
       id: matlab
       with:
-        release: ${{ matrix.matlab-version }}
+        release: ${{ matrix.matlab-release }}
 
     - name: Build
       run: >
@@ -64,13 +65,15 @@ jobs:
       with:
         files: alpaqa-matlab-${{ matrix.name }}.zip
 
+    - run: conan cache clean
+
   build-windows:
     strategy:
       matrix:
         include:
           - os: windows-2022
             name: win64
-            matlab-version: 'R2021a'
+            matlab-release: 'R2021a'
             host: amd64
     runs-on: ${{ matrix.os }}
     steps:
@@ -88,12 +91,12 @@ jobs:
       uses: matlab-actions/setup-matlab@64144ac4bb7c754f9ef7642f693671c873701c60
       id: matlab
       with:
-        release: ${{ matrix.matlab-version }}
+        release: ${{ matrix.matlab-release }}
 
     - name: Build
       shell: cmd
       run: >
-        call scripts\ci\build-matlab-windows.bat
+        call .\scripts\ci\build-matlab-windows.bat
         "${{ steps.matlab.outputs.matlabroot }}" "${{ matrix.host }}" "." "staging"
 
     - name: Package
diff --git a/scripts/ci/build-matlab-windows.bat b/scripts/ci/build-matlab-windows.bat
index 0bae0597e2..e7af3bac58 100644
--- a/scripts/ci/build-matlab-windows.bat
+++ b/scripts/ci/build-matlab-windows.bat
@@ -18,7 +18,7 @@ set "out_dir=%~4"
 if "%out_dir%"=="" set "out_dir=staging\matlab"
 
 :: Source the Visual Studio environment
-set "vcvarsall_path=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat"
+set "vcvarsall_path=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
 call "%vcvarsall_path%" %triple% || exit /b 1
 
 :: Create Conan profiles
diff --git a/scripts/ci/profiles/macos.profile b/scripts/ci/profiles/macos.profile
index ace2488a05..5eac98526c 100644
--- a/scripts/ci/profiles/macos.profile
+++ b/scripts/ci/profiles/macos.profile
@@ -4,6 +4,7 @@ include(default)
 os.version=11.0
 
 [conf]
+tools.build:skip_test=True
 tools.cmake.cmaketoolchain:generator=Ninja Multi-Config
 tools.build:compiler_executables*={"fortran": "FC-NOTFOUND" }
 
diff --git a/scripts/ci/profiles/windows-amd64.profile b/scripts/ci/profiles/windows-amd64.profile
index a974f3c3b9..5d817e8307 100644
--- a/scripts/ci/profiles/windows-amd64.profile
+++ b/scripts/ci/profiles/windows-amd64.profile
@@ -1,6 +1,7 @@
 include(default)
 
 [conf]
+tools.build:skip_test=True
 tools.build:cxxflags+=["/arch:AVX2"]
 tools.build:cflags+=["/arch:AVX2"]
 tools.cmake.cmaketoolchain:generator=Ninja Multi-Config