Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
b3d1077f
Verified
Commit
b3d1077f
authored
2 years ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
CI: use system-wide Octave binary
(manually cherry picked from commit
f07d73e6
)
parent
73bfd392
No related branches found
No related tags found
No related merge requests found
Pipeline
#8237
passed
2 years ago
Stage: build
Stage: test
Stage: pkg
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-4
3 additions, 4 deletions
.gitlab-ci.yml
matlab/modules/dseries
+1
-1
1 addition, 1 deletion
matlab/modules/dseries
matlab/modules/reporting
+1
-1
1 addition, 1 deletion
matlab/modules/reporting
with
5 additions
and
6 deletions
.gitlab-ci.yml
+
3
−
4
View file @
b3d1077f
...
...
@@ -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:
...
...
@@ -27,7 +26,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
:
...
...
@@ -66,7 +65,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
:
...
...
@@ -146,7 +145,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
:
...
...
This diff is collapsed.
Click to expand it.
dseries
@
617ef2e1
Compare
27fc8a0c
...
617ef2e1
Subproject commit
27fc8a0c181895fd5b7ab41ea0970f8af9a7acf1
Subproject commit
617ef2e11925f336184a5c4b52bd708d49170219
This diff is collapsed.
Click to expand it.
reporting
@
021e916c
Compare
31c22865
...
021e916c
Subproject commit
31c228658211e38132dfce4cc0e8fa563f918285
Subproject commit
021e916c6bf99090416845a8f6e7ea54a9403013
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment