Skip to content
Snippets Groups Projects
Verified Commit 5a6d03a2 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

CI: adapt for new location of MATLAB binaries

parent 399532a2
No related branches found
No related tags found
No related merge requests found
Pipeline #8524 passed
...@@ -28,7 +28,7 @@ build_binaries: ...@@ -28,7 +28,7 @@ build_binaries:
stage: build stage: build
script: script:
- autoreconf -si - autoreconf -si
- ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION" - ./configure --with-matlab=/opt/MATLAB/$MATLAB_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION"
- make -j $(nproc) LN_S="cp -p" - make -j $(nproc) LN_S="cp -p"
artifacts: artifacts:
paths: paths:
...@@ -56,7 +56,7 @@ pkg_source: ...@@ -56,7 +56,7 @@ pkg_source:
- rm doc/manual/source/_static/mathjax && sed -i "/^mathjax_path *=/d" doc/manual/source/conf.py - rm doc/manual/source/_static/mathjax && sed -i "/^mathjax_path *=/d" doc/manual/source/conf.py
- 'for f in configure.ac preprocessor/configure.ac mex/build/matlab/configure.ac mex/build/octave/configure.ac; do sed -i "s/^AC_INIT(\[\(.*\)\],\s*\[\(.*\)\])/AC_INIT([\1], [$VERSION])/" $f; done' - 'for f in configure.ac preprocessor/configure.ac mex/build/matlab/configure.ac mex/build/octave/configure.ac; do sed -i "s/^AC_INIT(\[\(.*\)\],\s*\[\(.*\)\])/AC_INIT([\1], [$VERSION])/" $f; done'
- autoreconf -si - autoreconf -si
- ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION - ./configure --with-matlab=/opt/MATLAB/$MATLAB_VERSION
- make dist - make dist
artifacts: artifacts:
paths: paths:
...@@ -67,7 +67,7 @@ pkg_source: ...@@ -67,7 +67,7 @@ pkg_source:
pkg_windows: pkg_windows:
stage: pkg stage: pkg
script: script:
- mkdir -p windows/deps/tarballs && cp ~/tarballs/matlab64-* windows/deps/tarballs/ - mkdir -p windows/deps/tarballs && cp /usr/lib/dynare-runner/matlab64-* windows/deps/tarballs/
- make -C windows - make -C windows
- rm windows/deps/tarballs/matlab64-* # No need to cache these files - rm windows/deps/tarballs/matlab64-* # No need to cache these files
cache: cache:
...@@ -123,14 +123,14 @@ test_matlab: ...@@ -123,14 +123,14 @@ test_matlab:
extends: .test_matlab_template extends: .test_matlab_template
script: script:
- autoreconf -si - autoreconf -si
- ./configure --disable-octave --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION - ./configure --disable-octave --with-matlab=/opt/MATLAB/$MATLAB_VERSION
- make -j $(($(nproc) * 3 / 4)) -C tests check-matlab - make -j $(($(nproc) * 3 / 4)) -C tests check-matlab
test_old_matlab: test_old_matlab:
extends: .test_matlab_template extends: .test_matlab_template
script: script:
- autoreconf -si - autoreconf -si
- ./configure --disable-octave --with-matlab=/usr/local/MATLAB/$OLD_MATLAB_VERSION - ./configure --disable-octave --with-matlab=/opt/MATLAB/$OLD_MATLAB_VERSION
- make -C mex/build/matlab clean - make -C mex/build/matlab clean
- make -j $(nproc) -C mex/build/matlab - make -j $(nproc) -C mex/build/matlab
- make -j $(($(nproc) * 3 / 4)) -C tests check-matlab - make -j $(($(nproc) * 3 / 4)) -C tests check-matlab
......
Subproject commit 0e275d751e5887075786b09d513fb3661f8ca7a2 Subproject commit 9c1a33c69010473cfe5c9144b4c636a900a2b268
Subproject commit 5d7f7e0c2bbf1985a516662c360d984e230a38c8 Subproject commit 8800d4459299fde7362dd2ccce64b0a96477aa68
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment