diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..84c53bf149a34b581e79044993ee0a2309097dda --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,20 @@ +before_script: + - git clone https://git.dynare.org/Dynare/dynare.git + - git clone https://git.dynare.org/Dynare/dates.git + - git clone https://git.dynare.org/Dynare/dseries.git + +testsuite_matlab: + stage: test + script: + - make check-matlab + artifacts: + paths: + - test/report.pdf + +testsuite_octave: + stage: test + script: + - make check-octave + artifacts: + paths: + - test/report.pdf diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d9133078eb136ef2ef87eec1187f033aa3d5a930..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -language: cpp -sudo: required -os: osx -osx_image: xcode7.3 -cache: ccache - -cache: - directories: - - /usr/local - -before_install: - - wget http://ctan.math.utah.edu/ctan/tex-archive/systems/mac/mactex/BasicTeX.pkg -O "/tmp/BasicTeX.pkg" - - echo "Installing OS X binary package for MacTeX" - - sudo installer -pkg "/tmp/BasicTeX.pkg" -target / -dumplog -verbose - - rm "/tmp/BasicTeX.pkg" - - export PATH=/usr/texbin:/Library/TeX/texbin/pdflatex:$PATH - - sudo /Library/TeX/texbin/tlmgr update --self - - sudo /Library/TeX/texbin/tlmgr install pgfplots adjustbox collectbox datetime fmtcount - - brew update - - brew install ccache - - brew install octave - -install: - - git clone --depth=1 --recursive --branch=master https://git.dynare.org/Dynare/dynare.git ~/builds/dynare - -script: - - make check-octave - - ./success.sh diff --git a/Makefile b/Makefile index 7ca3b08b7517c3d87d362e70ec8107c239c803c3..49caf2f1e179303154e390f31655ade6216f4856 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: check-octave check-matlab check-octave: @cd test ;\ - $(OCTAVE) --silent --no-history runtest.m + $(OCTAVE) --silent --no-history runtest.m && [ -f report.pdf ] check-matlab: - @$(MATLAB) -nosplash -nodisplay -r "cd test; runtest; quit" + @$(MATLAB) -nosplash -nodisplay -r "cd test; runtest; quit" && [ -f test/report.pdf ] diff --git a/README.md b/README.md index ab6be9d31b38689357aaf3e9c72a3527f8f79f3e..80aa529a42c214c80c49e40cc1ad330598510183 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ - - # Dynare Reporting Originally designed to provide reporting functionality for diff --git a/success.sh b/success.sh deleted file mode 100755 index 84373094263e13818e0a8e72d02982d4e1ce83a5..0000000000000000000000000000000000000000 --- a/success.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -if [ ! -f test/report.pdf ]; then - exit 1; -fi diff --git a/test/runtest.m b/test/runtest.m index 6b6a4788a32243569d75c1fe5a0e9a5c95bbeb5f..8a18595bec83d168d99b6a575de5c31c0f9a61c7 100644 --- a/test/runtest.m +++ b/test/runtest.m @@ -15,9 +15,9 @@ % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -addpath('~/builds/dynare/matlab/utilities/general') -addpath('~/builds/dynare/matlab/modules/dates/src') -addpath('~/builds/dynare/matlab/modules/dseries/src') +addpath('../dynare/matlab/utilities/general') +addpath('../dates/src') +addpath('../dseries/src') addpath('../src') initialize_dates_toolbox;