Merge pull request #130 from zbeekman/issue-119-travis-container-build

Issue 119 travis container build

Author: jacobwilliams

.travis.yml

@@ -3,10 +3,30 @@ language: python
 python:
   - 2.7
 
+sudo: false
+
+cache:
+  apt: true
+  pip: true
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.local
+
+addons:
+  apt:
+    sources:
+      - kalakris-cmake
+      - ubuntu-toolchain-r-test
+    packages:
+      - gfortran-4.9
+      - gfortran-5
+      - binutils
+      - cmake
+      - python-pip
+
 # Build matrix: Run the three build systems and tests in parallel
 env:
   global:
-    - DEPENDS="gfortran-4.9"
     - CHECK_README_PROGS="yes"
   matrix:
       # CMake build with unit tests, no documentation, with coverage analysis
@@ -17,72 +37,40 @@ env:
       cd cmake-build &&
       cmake -DCMAKE_BUILD_TYPE=COVERAGE .. &&
       make -j 4 check"
-      SPECIFIC_DEPENDS="cmake nodejs"
-      JLINT="yes"
-      DOCS="yes"
-      FoBiS="no"
       CODE_COVERAGE="yes"
 
       # build with build.sh, make documentation, run unit tests and perform coverage analysis
     - BUILD_SCRIPT="./build.sh --coverage --enable-unicode"
-      SPECIFIC_DEPENDS="binutils"
-      JLINT="no"
-      DOCS="yes"
-      FoBiS="yes"
       CODE_COVERAGE="yes"
 
-      # test scons build, no documentation or jsonlint, run unit tests
-    - BUILD_SCRIPT="scons && scons test"
-      SPECIFIC_DEPENDS=""
-      JLINT="no"
-      DOCS="no"
-      FoBiS="no"
-
-before_install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - |
-    if [[ $SPECIFIC_DEPENDS == *cmake* ]]; then
-      sudo apt-add-repository -y ppa:kalakris/cmake
-    fi
-  - sudo apt-get update -qq
-  - |
-    if [[ $JLINT == [yY]* ]]; then
-      curl -sL https://deb.nodesource.com/setup | sudo bash -x -
-    fi
-  - |
-    if [[ $CHECK_README_PROGS == [yY]* ]]; then
-      wget http://people.sc.fsu.edu/~jburkardt/f_src/f90split/f90split.f90
-    fi
-  - |
-    if [[ $DOCS == [yY]* ]]; then
-      export DEPENDS="$DEPENDS exuberant-ctags"
-    fi
-  - ulimit -s unlimited
-
 install:
-  - sudo apt-get install -y $SPECIFIC_DEPENDS $DEPENDS
-  - |
-    if [[ $JLINT == [yY]* ]]; then
-      sudo npm install -g jsonlint
-    fi
-  - sudo ln -fs /usr/bin/gfortran-4.9 /usr/bin/gfortran && gfortran --version
-  - sudo ln -fs /usr/bin/gcov-4.9 /usr/bin/gcov && gcov --version
   - |
-    if [[ $FoBiS == [yY]* ]]; then
-      sudo -H pip install FoBiS.py && FoBiS.py --version
+    if [[ ! -d "$HOME/.local/bin" ]]; then
+      mkdir "$HOME/.local/bin"
     fi
+  - export PATH="$HOME/.local/bin:$PATH"
+  - export FC=/usr/bin/gfortran-4.9
+  - ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" && gfortran --version
+  - ls -l /usr/bin/gfortran-4.9
+  - ln -fs /usr/bin/gcov-4.9 "$HOME/.local/bin/gcov" && gcov --version
   - |
-    if [[ $DOCS == [yY]* ]]; then
-      sudo -H pip install ford && ford --version
+    if ! which f90split; then
+      wget http://people.sc.fsu.edu/~jburkardt/f_src/f90split/f90split.f90 && \
+      gfortran -o f90split f90split.f90 && \
+      mv f90split "$HOME/.local/bin/" && \
+      rm f90split.f90
     fi
+  - which FoBiS.py || (pip install FoBiS.py && FoBiS.py --version)
+  - which ford || (pip install ford && ford --version)
+  - which jsonlint || (pip install git+https://github.com/dmeranda/demjson.git && jsonlint --version)
+
+before_script:
   - |
     if [[ $CHECK_README_PROGS == [yY]* ]]; then
-      gfortran -o f90split f90split.f90 && \
-      ./f90split README.md && \
+      f90split README.md && \
       for f in example*.md; do
         mv $f src/tests/jf_test_${f%.md}.f90
       done
-      rm f90split.f90 f90split
     fi
 
 script:
@@ -91,7 +79,10 @@ script:
 
 after_success:
   - cd $TRAVIS_BUILD_DIR
-  - if [[ $CODE_COVERAGE == [yY]* ]]; then bash <(curl -s https://codecov.io/bash) ; fi
+  - |
+    if [[ $CODE_COVERAGE == [yY]* ]]; then
+      bash <(curl -s https://codecov.io/bash)
+    fi
   - git config --global user.name "TRAVIS-CI-for-$(git --no-pager show -s --format='%cn' $TRAVIS_COMMIT)"
   - git config --global user.email "$(git --no-pager show -s --format='%ce' $TRAVIS_COMMIT)"
 #broken for now#  - ./deploy.sh #handles updating documentation for master branch as well as tags

CHANGELOG.md

@@ -17,6 +17,12 @@
 [Full Changelog](https://github.com/jacobwilliams/json-fortran/compare/4.1.1...HEAD)
 
 **Enhancements**
+- Removed official SCons support to facilitate faster development
+  cycle,
+  [\#121](https://github.com/jacobwilliams/json-fortran/issues/121)
+  via
+  [PR \#130](https://github.com/jacobwilliams/json-fortran/pull/130)
+  from [zbeekman](https://github.com/zbeekman)
 - Add a
   [CHANGELOG](https://github.com/jacobwilliams/json-fortran/blob/master/CHANGELOG.md)
   [\#120](https://github.com/jacobwilliams/json-fortran/issues/120)
@@ -63,6 +69,10 @@
 - Documentation fixes & coverage improvements
   [\#112](https://github.com/jacobwilliams/json-fortran/pull/112)
   ([zbeekman](https://github.com/zbeekman))
+- Speedier container based
+  [Travis-CI](https://travis-ci.org/jacobwilliams/json-fortran) builds
+  [\#130](https://github.com/jacobwilliams/json-fortran/pull/130)
+  ([zbeekman](https://github.com/zbeekman))
 
 
 ## [4.1.1](https://github.com/jacobwilliams/json-fortran/tree/4.1.1) (2015-05-27)

README.md

@@ -95,8 +95,6 @@ Currently, several ways are provided to build the jsonfortran library
 
 * A [Visual Studio](http://www.visualstudio.com) project is included for building the library (and unit tests) on Windows with the Intel Fortran Compiler.  The project has been tested with Visual Studio 2010 and 2013.
 
-* A [SCons](http://www.scons.org) `SConstruct` file.  The library and unit tests are built by typing `scons` and tested by typing `scons test`. The library may be optionally installed by `scons install` or `sudo scons install`.
-
 * A [CMake](http://www.cmake.org) build
 system is provided. This build system has been tested on Mac and Linux
 using the Intel Fortran Compiler, gfortran 4.9, and NAG Fortran 6.0. It has not been
@@ -291,7 +289,11 @@ The code above produces the file:
 Documentation
 --------------
 
-The API documentation for the latest release version can be found [here](http://jacobwilliams.github.io/json-fortran).  The documentation can also be generated by processing the source files with [FORD](https://github.com/cmacmackin/ford).  Note that both the shell script, CMake, and SCons will also generate these files automatically in the documentation folder, assuming you have FORD installed.
+The API documentation for the latest release version can be found
+[here](http://jacobwilliams.github.io/json-fortran).  The
+documentation can also be generated by processing the source files
+with [FORD](https://github.com/cmacmackin/ford).  Note that both the
+shell script and CMake will also generate these files automatically in the documentation folder, assuming you have FORD installed.
 
 [top](#json-fortran)