diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b178b69c077fa99bbcfeae07c0138b3cacc9f12..1086884ba49eb16c591c585d2fa7a40e0b5e7065 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ variables: TERM: linux MATLAB_VERSION: R2022b OLD_MATLAB_VERSION: R2014a - OCTAVE_VERSION: 7.3.0 # The next stanza creates the version number used for the source tarball and the # binary packages. Here are the following possible cases: @@ -29,7 +28,7 @@ build_binaries: stage: build script: - autoreconf -si - - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION --with-octave=/usr/local/octave/$OCTAVE_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION" + - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION PACKAGE_VERSION=$VERSION PACKAGE_STRING="dynare $VERSION" - make -j $(nproc) LN_S="cp -p" artifacts: paths: @@ -57,7 +56,7 @@ pkg_source: - 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' - autoreconf -si - - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION --with-octave=/usr/local/octave/$OCTAVE_VERSION + - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION - make dist artifacts: paths: @@ -138,7 +137,7 @@ test_octave: OPENBLAS_NUM_THREADS: 1 script: - autoreconf -si - - ./configure --disable-matlab --with-octave=/usr/local/octave/$OCTAVE_VERSION + - ./configure --disable-matlab - make -j $(nproc) -C tests check-octave artifacts: paths: diff --git a/matlab/modules/dseries b/matlab/modules/dseries index 1a4600849d294dd7712239b3ce3ca80e20b6fefa..72c81ac028822bd0985c5b03d1f61b501efbcbeb 160000 --- a/matlab/modules/dseries +++ b/matlab/modules/dseries @@ -1 +1 @@ -Subproject commit 1a4600849d294dd7712239b3ce3ca80e20b6fefa +Subproject commit 72c81ac028822bd0985c5b03d1f61b501efbcbeb diff --git a/matlab/modules/reporting b/matlab/modules/reporting index 275f2f4f528a6febfd981478de7eba8eb912e560..cfbeb9a12d6b859c4a1321225fab010a7f2f5046 160000 --- a/matlab/modules/reporting +++ b/matlab/modules/reporting @@ -1 +1 @@ -Subproject commit 275f2f4f528a6febfd981478de7eba8eb912e560 +Subproject commit cfbeb9a12d6b859c4a1321225fab010a7f2f5046