Have Travis also build on Debian and on Ubuntu with Python3

espressomd · Aug 31, 2016 · c45f36d · c45f36d
1 parent 55b64a4
commit c45f36d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,12 @@ sudo: required
 
 services: docker
 
-before_install:
-        - docker pull espressomd/travis-build:latest
-
-
 env:
   matrix:
     - myconfig=default
     - myconfig=maxset
+    - myconfig=maxset image=ubuntu-python3
+    - myconfig=maxset image=debian
     - myconfig=maxset-gaussrandom
     - myconfig=maxset-gaussrandomcut
     - myconfig=molcut

diff --git a/maintainer/travis/build_docker.sh b/maintainer/travis/build_docker.sh
@@ -13,4 +13,8 @@ check_procs=$check_procs
 make_check=$make_check
 EOF
 
-docker run -u espresso --env-file $ENV_FILE -v ${PWD}:/travis -it espressomd/travis-build /bin/bash -c "git clone /travis && cd travis && maintainer/travis/build_cmake.sh"
+if [ -z "$image" ]; then
+	image=ubuntu
+fi
+
+docker run -u espresso --env-file $ENV_FILE -v ${PWD}:/travis -it espressomd/buildenv-espresso-${image} /bin/bash -c "git clone /travis && cd travis && maintainer/travis/build_cmake.sh"