From 30d2b0937413566f9af17f95a245c4151cdf0afa Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 24 Dec 2015 17:58:52 +0000 Subject: [PATCH] Putting travis configuration back the way it was for now. --- .travis.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81664c748..cb707f2f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,19 +5,14 @@ services: env: matrix: - - DOCKIMG=unidata/nctests:serial USECMAKE=TRUE USEAC=TRUE USE_CC=gcc CURHOST=docker-gcc-x64s COPTS=-fsigned-char - - DOCKIMG=unidata/nctests:serial USECMAKE=TRUE USEAC=TRUE USE_CC=clang CURHOST=docker-clang-x64s COPTS=-fsigned-char - - DOCKIMG=unidata/nctests:serial32 USECMAKE=TRUE USEAC=TRUE USE_CC=gcc CURHOST=docker-gcc-x86s COPTS=-fsigned-char - - DOCKIMG=unidata/nctests:serial32 USECMAKE=TRUE USEAC=TRUE USE_CC=clang CURHOST=docker-clang-x86s COPTS=-fsigned-char - - - DOCKIMG=unidata/nctests:serial USECMAKE=TRUE USEAC=TRUE USE_CC=gcc CURHOST=docker-gcc-x64us COPTS=-funsigned-char - - DOCKIMG=unidata/nctests:serial USECMAKE=TRUE USEAC=TRUE USE_CC=clang CURHOST=docker-clang-x64us COPTS=-funsigned-char - - DOCKIMG=unidata/nctests:serial32 USECMAKE=TRUE USEAC=TRUE USE_CC=gcc CURHOST=docker-gcc-x86us COPTS=-funsigned-char - - DOCKIMG=unidata/nctests:serial32 USECMAKE=TRUE USEAC=TRUE USE_CC=clang CURHOST=docker-clang-x86us COPTS=-funsigned-char + - DOCKIMG=unidata/nctests:serial USECMAKE=TRUE USEAC=TRUE USE_CC=gcc CURHOST=docker-gcc-x64 + - DOCKIMG=unidata/nctests:serial USECMAKE=TRUE USEAC=TRUE USE_CC=clang CURHOST=docker-clang-x64 + - DOCKIMG=unidata/nctests:serial32 USECMAKE=TRUE USEAC=TRUE USE_CC=gcc CURHOST=docker-gcc-x86 + - DOCKIMG=unidata/nctests:serial32 USECMAKE=TRUE USEAC=TRUE USE_CC=clang CURHOST=docker-clang-x86 before_install: - docker pull $DOCKIMG > /dev/null script: - - docker run --rm -it -h "$CURHOST" -e USEDASH=TRUE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e COPTS="$COPTS" -v $(pwd):/netcdf-c $DOCKIMG + - docker run --rm -it -h "$CURHOST" -e USEDASH=TRUE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -v $(pwd):/netcdf-c $DOCKIMG