Skip to content

Commit

Permalink
fix remaining ci
Browse files Browse the repository at this point in the history
  • Loading branch information
RSchwan committed Nov 1, 2024
1 parent b53adb1 commit 2394781
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/matlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,17 @@ jobs:

- name: Install Eigen
working-directory: build_external
run: bash ../ci/install_eigen.sh
run: bash ../ci/install_eigen.sh

- name: Setup Ninja
if: runner.os == 'Windows'
uses: seanmiddleditch/gha-setup-ninja@master

- name: Install blasfeo
working-directory: build_external
run: |
bash ../ci/download_blasfeo.sh
bash ../ci/build_install_blasfeo.sh GENERIC generic
- name: Set up MATLAB
uses: matlab-actions/setup-matlab@v2
Expand All @@ -51,7 +61,7 @@ jobs:
with:
command: cd interfaces/matlab, make_piqp

- name: Run tests in MATLAB
- name: Run tests in MATLAB
uses: matlab-actions/run-command@v2
with:
command: cd interfaces/matlab, runtest_piqp
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,20 @@ jobs:
# Workaround for https://github.com/conda-incubator/setup-miniconda/issues/186
conda config --remove channels defaults
# Compiler infrastructure
mamba install cmake compilers make pkg-config
# Eigen
mamba install eigen=${{ matrix.eigen }}
conda install cmake compilers make pkg-config
# Dependencies
mamba install libmatio
conda install eigen=${{ matrix.eigen }} libmatio
- name: Setup Ninja
if: runner.os == 'Windows'
uses: seanmiddleditch/gha-setup-ninja@master

# replace with conda as soon as https://github.com/giaf/blasfeo/issues/181 is resolved
- name: Install blasfeo
working-directory: build_external
run: |
bash ../ci/download_blasfeo.sh
bash ../ci/build_install_blasfeo.sh GENERIC generic
- name: Setup working directories
shell: bash -l {0}
Expand Down

0 comments on commit 2394781

Please sign in to comment.