From d1ea4e75e52a37fe84142fcc88fe01a39f8c2a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 17 Dec 2020 16:32:52 +0100
Subject: [PATCH] CI: use variables for chosing MATLAB and Octave versions

---
 matlab/reporting/.gitlab-ci.yml | 13 ++++++++-----
 matlab/reporting/Makefile       |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/matlab/reporting/.gitlab-ci.yml b/matlab/reporting/.gitlab-ci.yml
index 38896390c..80dae3a6b 100644
--- a/matlab/reporting/.gitlab-ci.yml
+++ b/matlab/reporting/.gitlab-ci.yml
@@ -1,20 +1,23 @@
+variables:
+  MATLAB_VERSION: R2020b
+  OLD_MATLAB_VERSION: R2014a
+  OCTAVE_VERSION: 5.2.0
+
 before_script:
   - git clone https://git.dynare.org/Dynare/dseries.git
 
 test_matlab:
   stage: test
   script:
-    - make check-matlab
+    - make check-matlab MATLAB=/usr/local/MATLAB/$MATLAB_VERSION/bin/matlab
   artifacts:
     paths:
       - test/my/report/dir/report.pdf
 
 test_old_matlab:
   stage: test
-  variables:
-    MATLAB: /usr/local/MATLAB/R2014a/bin/matlab
   script:
-    - make check-matlab
+    - make check-matlab MATLAB=/usr/local/MATLAB/$OLD_MATLAB_VERSION/bin/matlab
   artifacts:
     paths:
       - test/my/report/dir/report.pdf
@@ -22,7 +25,7 @@ test_old_matlab:
 test_octave:
   stage: test
   script:
-    - make check-octave
+    - make check-octave OCTAVE=/usr/local/octave/$OCTAVE_VERSION/bin/octave
   artifacts:
     paths:
       - test/my/report/dir/report.pdf
diff --git a/matlab/reporting/Makefile b/matlab/reporting/Makefile
index 451261ef2..ed0a6418a 100644
--- a/matlab/reporting/Makefile
+++ b/matlab/reporting/Makefile
@@ -1,5 +1,5 @@
 OCTAVE ?= octave-cli
-MATLAB ?= $(shell which matlab)
+MATLAB ?= matlab
 
 all: check-octave check-matlab