Skip to content

Commit

Permalink
Merge pull request #12 from opencobra/develop
Browse files Browse the repository at this point in the history
Regular merge of develop
  • Loading branch information
syarra authored Mar 7, 2018
2 parents 21a2724 + 8681281 commit b767079
Show file tree
Hide file tree
Showing 73 changed files with 3,155 additions and 494 deletions.
6 changes: 5 additions & 1 deletion .travis.yml → .artenolis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ script:
- cd $CURRENT_DIR;

# launch the tests
- sh ./runtests.sh;
- sh ./.artenolis/runtests.sh;

- cd ~/fork-MATLAB.devTools.CI;
- git reset --hard origin/develop;
Expand All @@ -58,4 +58,8 @@ after_success:
# remove the cloned fork-repo
- if [ "$MATLAB_VER" == "R2016b" ]; then
bash <(curl -s https://codecov.io/bash) -f "!*.lst";
export PATH="/home/sbg-jenkins/.local/bin":$PATH;
cd $CURRENT_DIR;
pip install --upgrade --user -r docs/requirements.txt;
python -c "from documenter.deploy import Documentation; doc = Documentation('github.com/opencobra/MATLAB.devTools', ci='jenkins'); doc.deploy()";
fi
5 changes: 5 additions & 0 deletions .artenolis/runtests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
cd ./test
/mnt/prince-data/MATLAB/$MATLAB_VER/bin/./matlab -nodesktop -nosplash -r "launchTests;" < inputCI.txt;
CODE=$?
exit $CODE
40 changes: 39 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,40 @@
build
*.*~
.DS_Store
Thumbs.db
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows shortcuts
*.lnk

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Documentation related files
docs/source/_static/json/functions.json
*.pyc
52 changes: 0 additions & 52 deletions FAQ.md

This file was deleted.

78 changes: 0 additions & 78 deletions PREREQUISITES.md

This file was deleted.

80 changes: 0 additions & 80 deletions README.md

This file was deleted.

Loading

0 comments on commit b767079

Please sign in to comment.