Skip to content

Commit 0228c0f

Browse files
committed
Revert "[CI] temporarily install Matlab dependencies only"
This reverts commit 244d716.
1 parent 682fa5d commit 0228c0f

File tree

3 files changed

+24
-28
lines changed

3 files changed

+24
-28
lines changed

.github/workflows/matlab.yml

-4
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ jobs:
5151
"${{ steps.matlab.outputs.matlabroot }}" ${{ matrix.host }} . staging
5252
5353
- name: Package
54-
if: false
5554
run: zip -r ../alpaqa-matlab-${{ matrix.name }}.zip ./*
5655
working-directory: staging
5756

5857
- name: Upload
59-
if: false
6058
uses: actions/upload-artifact@v4
6159
with:
6260
name: alpaqa-matlab-${{ matrix.name }}
@@ -102,12 +100,10 @@ jobs:
102100
"${{ steps.matlab.outputs.matlabroot }}" "${{ matrix.host }}" "." "staging"
103101
104102
- name: Package
105-
if: false
106103
shell: pwsh
107104
run: Compress-Archive -Path staging\* alpaqa-matlab-${{ matrix.name }}.zip
108105

109106
- name: Upload
110-
if: false
111107
uses: actions/upload-artifact@v4
112108
with:
113109
name: alpaqa-matlab-${{ matrix.name }}

scripts/ci/build-matlab-linux.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ for cfg in Release; do
2828
-s build_type=$cfg
2929
done
3030

31-
# # Build MATLAB bindings
32-
# pushd "$pkg_dir"
33-
# cmake --preset conan-matlab-release \
34-
# -D CMAKE_FIND_ROOT_PATH="$matlab_dir" \
35-
# -D CMAKE_C_COMPILER_LAUNCHER=sccache \
36-
# -D CMAKE_CXX_COMPILER_LAUNCHER=sccache
37-
# cmake --build --preset conan-matlab-release \
38-
# -t alpaqa_mex -v
39-
# cmake --install build/matlab-release \
40-
# --component mex_interface --prefix "$out_dir"
41-
# popd
31+
# Build MATLAB bindings
32+
pushd "$pkg_dir"
33+
cmake --preset conan-matlab-release \
34+
-D CMAKE_FIND_ROOT_PATH="$matlab_dir" \
35+
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
36+
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache
37+
cmake --build --preset conan-matlab-release \
38+
-t alpaqa_mex -v
39+
cmake --install build/matlab-release \
40+
--component mex_interface --prefix "$out_dir"
41+
popd

scripts/ci/build-matlab-windows.bat

+13-13
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ for %%C in (Release) do (
4747
)
4848

4949
:: Build MATLAB bindings
50-
:: pushd "%pkg_dir%"
51-
:: cmake --preset conan-matlab-release ^
52-
:: -D CMAKE_FIND_ROOT_PATH="%matlab_dir%" ^
53-
:: -D CMAKE_C_COMPILER_LAUNCHER=sccache ^
54-
:: -D CMAKE_CXX_COMPILER_LAUNCHER=sccache ^
55-
:: || exit /b 1
56-
:: cmake --build --preset conan-matlab-release ^
57-
:: -t alpaqa_mex -v ^
58-
:: || exit /b 1
59-
:: cmake --install build\matlab-release ^
60-
:: --component mex_interface --prefix "%out_dir%" ^
61-
:: || exit /b 1
62-
:: popd
50+
pushd "%pkg_dir%"
51+
cmake --preset conan-matlab-release ^
52+
-D CMAKE_FIND_ROOT_PATH="%matlab_dir%" ^
53+
-D CMAKE_C_COMPILER_LAUNCHER=sccache ^
54+
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache ^
55+
|| exit /b 1
56+
cmake --build --preset conan-matlab-release ^
57+
-t alpaqa_mex -v ^
58+
|| exit /b 1
59+
cmake --install build\matlab-release ^
60+
--component mex_interface --prefix "%out_dir%" ^
61+
|| exit /b 1
62+
popd

0 commit comments

Comments
 (0)