Skip to content
Snippets Groups Projects
Verified Commit 1f9ee844 authored by Sébastien Villemot's avatar Sébastien Villemot Committed by Stéphane Adjemian
Browse files

CI: use system-wide Octave binary

parent 01fabdd9
Branches
Tags
No related merge requests found
...@@ -3,7 +3,6 @@ variables: ...@@ -3,7 +3,6 @@ variables:
TERM: linux TERM: linux
MATLAB_VERSION: R2022b MATLAB_VERSION: R2022b
OLD_MATLAB_VERSION: R2014a OLD_MATLAB_VERSION: R2014a
OCTAVE_VERSION: 7.3.0
# The next stanza creates the version number used for the source tarball and the # The next stanza creates the version number used for the source tarball and the
# binary packages. Here are the following possible cases: # binary packages. Here are the following possible cases:
...@@ -29,7 +28,7 @@ build_binaries: ...@@ -29,7 +28,7 @@ build_binaries:
stage: build stage: build
script: script:
- autoreconf -si - 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" - make -j $(nproc) LN_S="cp -p"
artifacts: artifacts:
paths: paths:
...@@ -57,7 +56,7 @@ pkg_source: ...@@ -57,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 --with-octave=/usr/local/octave/$OCTAVE_VERSION - ./configure --with-matlab=/usr/local/MATLAB/$MATLAB_VERSION
- make dist - make dist
artifacts: artifacts:
paths: paths:
...@@ -138,7 +137,7 @@ test_octave: ...@@ -138,7 +137,7 @@ test_octave:
OPENBLAS_NUM_THREADS: 1 OPENBLAS_NUM_THREADS: 1
script: script:
- autoreconf -si - autoreconf -si
- ./configure --disable-matlab --with-octave=/usr/local/octave/$OCTAVE_VERSION - ./configure --disable-matlab
- make -j $(nproc) -C tests check-octave - make -j $(nproc) -C tests check-octave
artifacts: artifacts:
paths: paths:
......
Subproject commit 1a4600849d294dd7712239b3ce3ca80e20b6fefa Subproject commit 72c81ac028822bd0985c5b03d1f61b501efbcbeb
Subproject commit 275f2f4f528a6febfd981478de7eba8eb912e560 Subproject commit cfbeb9a12d6b859c4a1321225fab010a7f2f5046
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment