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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
5a6d03a2
Verified
Commit
5a6d03a2
authored
2 years ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
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
2 years ago
Stage: build
Stage: test
Stage: pkg
Stage: deploy
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+5
-5
5 additions, 5 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
7 additions
and
7 deletions
.gitlab-ci.yml
+
5
−
5
View file @
5a6d03a2
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
dseries
@
9c1a33c6
Compare
0e275d75
...
9c1a33c6
Subproject commit
0e275d751e5887075786b09d513fb3661f8ca7a2
Subproject commit
9c1a33c69010473cfe5c9144b4c636a900a2b268
This diff is collapsed.
Click to expand it.
reporting
@
8800d445
Compare
5d7f7e0c
...
8800d445
Subproject commit
5d7f7e0c2bbf1985a516662c360d984e230a38c
8
Subproject commit
8800d4459299fde7362dd2ccce64b0a96477aa6
8
This diff is collapsed.
Click to expand it.
Sébastien Villemot
@sebastien
mentioned in commit
0ef17a87
·
2 years ago
mentioned in commit
0ef17a87
mentioned in commit 0ef17a87213c4c714188987195f36648f09b3066
Toggle commit list
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