Fix problems in CI failures (travis and semaphore)

In the Makefile.am, switched out the fetch (which can have auth problems
in certain envs) with a simple branch per @perlpunk++'s suggestion.

With the new test branches, travis had a problem in that it only clones
one branch and we need the other branch refs to be available. Fixed this
by fetching the other branch refs. I also cleaned up the travis YAML
file.

The Ubuntu 14.04 docker image (used by semaphoreci) had an older git,
without the worktree command, so I made it install the latest git from a
ppa.

Renamed tests/run-tests.sh to tests/run-all-tests.sh for tab completion
conflict reasons.

diff --git a/.travis.yml b/.travis.yml
index 8140b72bf3353f6d8fe61383cf9c324158e844f4..835a0e9a42aef6c0b660cff712f725862e76bd07 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,27 @@
+language: c
 
 matrix:
   include:
-    - os: linux
-      sudo: required
-      compiler: gcc
-    - os: linux
-      sudo: required
-      compiler: clang
-    - os: osx
-      compiler: gcc
-    - os: osx
-      compiler: clang
-
-language: c
+  - os: linux
+    compiler: gcc
+    sudo: required
+  - os: linux
+    compiler: clang
+    sudo: required
+  - os: osx
+    compiler: gcc
+  - os: osx
+    compiler: clang
 
 before_install:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user scikit-ci-addons==0.15.0; ci_addons travis/install_cmake 3.2.0; fi
 
-script: tests/run-tests.sh
+# Travis branch-specific clone problem workaround:
+- git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
+- git fetch
+
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    pip install --user scikit-ci-addons==0.15.0;
+    ci_addons travis/install_cmake 3.2.0;
+  fi
+
+script: tests/run-all-tests.sh

diff --git a/Makefile.am b/Makefile.am
index 45ad78d58e79938797d45aac20869d10977cd857..c0cf7ce7bc4fc725d4cdba847e001c9b47ce56ea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,11 +9,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = yaml-0.1.pc
 
 maintainer-clean-local:
-       -rm -f aclocal.m4 config.h.in configure config/*
+       rm -f aclocal.m4 config.h.in configure config/*
        -find ${builddir} -name Makefile.in -exec rm -f '{}' ';'
 
 distclean-local:
-       -rm -fr tests/run-test-suite
+       rm -fr tests/run-test-suite
        -git worktree prune
 
 .PHONY: bootstrap
@@ -31,5 +31,6 @@ test-suite: tests/run-test-suite
 test-all: test test-suite
 
 tests/run-test-suite:
-       git fetch origin run-test-suite:run-test-suite
+       -git branch --track run-test-suite origin/run-test-suite
+       -git worktree prune
        git worktree add $@ run-test-suite

diff --git a/dockerfiles/ubuntu-14.04 b/dockerfiles/ubuntu-14.04
index b24688360cd2909fe87cd1ccd24fdd15d19c4ea1..ffb7c6b8991be588287c8d37916d8a296e1fb3b7 100644 (file)
--- a/dockerfiles/ubuntu-14.04
+++ b/dockerfiles/ubuntu-14.04
@@ -3,6 +3,11 @@ FROM ubuntu:14.04
 MAINTAINER Ian Cordasco <graffatcolmingov@gmail.com>
 
 RUN apt-get update && \
+    apt-get install -y \
+        software-properties-common \
+        python-software-properties && \
+    add-apt-repository ppa:git-core/ppa && \
+    apt-get update && \
     apt-get install -y \
         autoconf \
         build-essential \

diff --git a/tests/run-tests.sh b/tests/run-all-tests.sh
similarity index 100%
rename from tests/run-tests.sh
rename to tests/run-all-tests.sh