travis-ci: Base 3.14.12.2

epics-modules · Sep 20, 2017 · 4c356e1 · 4c356e1
1 parent f5e69f9
commit 4c356e1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/test-epics.sh → .ci/build-epics.sh b/test-epics.sh → .ci/build-epics.sh
@@ -3,6 +3,10 @@ set -e -x
 
 [ "$BASE" ] || exit 0
 
+make -j2 $EXTRA
+
+[ "$TEST" = "NO" ] && exit 0
+
 make tapfiles
 
 find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e -x
+
+[ "$KVER" ] || exit 0
+
+make -j2 $EXTRA
diff --git a/build-epics.sh → .ci/prepare-epics.sh b/build-epics.sh → .ci/prepare-epics.sh
@@ -15,13 +15,14 @@ die() {
 [ "$BASE" ] || exit 0
 
 CDIR="$HOME/.cache/base-$BASE-$STATIC"
+EPICS_BASE="$CDIR/base"
 
 if [ ! -e "$CDIR/built" ]
 then
   install -d "$CDIR"
   ( cd "$CDIR" && git clone --depth 50 --branch $BASE https://github.com/epics-base/epics-base.git base )
 
-  EPICS_BASE="$CDIR/base"
+  EPICS_HOST_ARCH=`sh $EPICS_BASE/startup/EpicsHostArch`
 
   case "$STATIC" in
   static)
@@ -33,8 +34,6 @@ EOF
   *) ;;
   esac
 
-  EPICS_HOST_ARCH=`sh $EPICS_BASE/startup/EpicsHostArch`
-
   case "$CMPLR" in
   clang)
     echo "Host compiler is clang"
@@ -58,7 +57,8 @@ EOF
 
   make -C "$EPICS_BASE" -j2
 
-  if [ "$BASE" = "3.14" ]; then
+  case "$BASE" in
+  *3.14*)
     ( cd "$CDIR" && wget https://www.aps.anl.gov/epics/download/extensions/extensionsTop_20120904.tar.gz && tar -xzf extensionsTop_*.tar.gz)
 
     ( cd "$CDIR" && wget https://www.aps.anl.gov/epics/download/extensions/msi1-7.tar.gz && tar -xzf msi1-7.tar.gz && mv msi1-7 extensions/src/msi)
@@ -73,7 +73,9 @@ EOF
     cp "$CDIR/extensions/bin/$EPICS_HOST_ARCH/msi" "$EPICS_BASE/bin/$EPICS_HOST_ARCH/"
 
     echo 'MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi' >> "$EPICS_BASE/configure/CONFIG_SITE"
-  fi
+    ;;
+  *) ;;
+  esac
 
   touch "$CDIR/built"
 fi

diff --git a/build-linux.sh → .ci/prepare-linux.sh b/build-linux.sh → .ci/prepare-linux.sh
diff --git a/.travis.yml b/.travis.yml
@@ -9,12 +9,13 @@ env:
  - BASE=3.15 STATIC=shared
  - BASE=3.14 STATIC=shared
  - BASE=3.14 STATIC=static
+ - BASE=R3.14.12.2 STATIC=shared TEST=NO
  - KSER=3.x KVER=3.2.1 EXTRA="-C mrmShared/linux KERNELDIR=$HOME/linux"
  - KSER=3.x KVER=3.16.1 EXTRA="-C mrmShared/linux KERNELDIR=$HOME/linux"
  - KSER=4.x KVER=4.9.1 EXTRA="-C mrmShared/linux KERNELDIR=$HOME/linux"
 install:
- - ./build-epics.sh
- - ./build-linux.sh
+ - ./.ci/prepare-epics.sh
+ - ./.ci/prepare-linux.sh
 script:
- - make -j2 $EXTRA
- - ./test-epics.sh
+ - ./.ci/build-epics.sh
+ - ./.ci/build-linux.sh