Use container CI

PDLPorters · Aug 18, 2015 · 934f852 · 934f852
1 parent 32ca97e
commit 934f852
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,29 @@
 language: perl
-sudo: true
+sudo: false
+addons:
+  apt:
+#    sources:
+#    - deadsnakes
+#    - ubuntu-toolchain-r-test
+    packages:
+    - build-essential
+    - libx11-dev
+    - libgd2-xpm-dev
+    - libhdf4-alt-dev
+    - libproj-dev
+    - proj-bin
+    - libcfitsio3-dev
+    - libreadline-dev
+    - gfortran
+    - pgplot5
+    - libvpx-dev
+    - libxpm-dev
+    # these are for OpenGL:
+    - libxi-dev
+    - libxmu-dev
+    - freeglut3-dev
+    - libgsl0-dev
+    - libnetpbm10-dev
 matrix:
   include:
     # start the first coverage early so that it starts before everything else
@@ -34,13 +58,10 @@ matrix:
   allow_failures:
     - perl: blead
 before_install:
-  - sudo apt-get update
-  - sudo apt-get install build-essential libx11-dev pgplot5 libgd2-xpm-dev libhdf4-alt-dev libproj-dev libvpx-dev libxpm-dev proj-bin libcfitsio3-dev libreadline-dev
-  - if [ "$DISABLE_FORTRAN" != 1 ]; then sudo apt-get install gfortran; fi # set DISABLE_FOTRAN = 1 to not install gfortran
+  - mkdir -p ~/bin; export PATH="$HOME/bin:$PATH"; G="$HOME/bin/gfortran"; if [ "$DISABLE_FORTRAN" == 1 ]; then touch "$G"; chmod a+x "$G"; echo 'false' >"$G"; else rm -f "$G"; fi # set DISABLE_FORTRAN = 1 to not have working gfortran
   # clang is already installed in Travis-CI environment. Using PERL_MM_OPT does not work with subdirectory Makefile.PLs so we override Config.pm
   # Also, both $Config{cc} and $Config{ld} need to be set because under ELF environments (such as Travis-CI's Ubuntu), this is what Perl's Config.pm does.
   - if [ "$CC" == "clang" ]; then mkdir build_aux; echo 'package force_clang; use ExtUtils::MakeMaker::Config; $Config{cc} = $Config{ld} = "clang"; 1' > build_aux/force_clang.pm; export PERL5OPT="-I$(pwd)/build_aux -Mforce_clang"; fi
-  - sudo apt-get install libxi-dev libxmu-dev freeglut3-dev libgsl0-dev libnetpbm10-dev # for OpenGL
   - export PGPLOT_DEV=/NULL
   - perl -pi -e 's|WITH_BADVAL => 1|WITH_BADVAL => 0|       if defined $ENV{PDL_WITH_BADVAL}    && $ENV{PDL_WITH_BADVAL}     == 0' perldl.conf # disable bad value support
   - perl -pi -e 's|BADVAL_USENAN => 0|BADVAL_USENAN => 1|   if defined $ENV{PDL_BADVAL_USENAN}  && $ENV{PDL_BADVAL_USENAN}   == 1' perldl.conf # enable BADVAL_USENAN