diff options
| author | Ingy döt Net <ingy@ingy.net> | 2018-01-06 00:03:42 -0800 |
|---|---|---|
| committer | Ingy döt Net <ingy@ingy.net> | 2018-01-06 14:39:12 -0800 |
| commit | aa10f65706b474987d17a6b66ae087f823758e6f (patch) | |
| tree | ed824924fe2a412198b33dfc46b73865646a8a31 | |
| parent | e4aee06ff401668404de21b4af4c6a90be0f35a6 (diff) | |
| download | libyaml-git-aa10f65706b474987d17a6b66ae087f823758e6f.tar.gz | |
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.
| -rw-r--r-- | .travis.yml | 35 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | dockerfiles/ubuntu-14.04 | 5 | ||||
| -rwxr-xr-x | tests/run-all-tests.sh (renamed from tests/run-tests.sh) | 0 |
4 files changed, 30 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 8140b72..835a0e9 100644 --- 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 45ad78d..c0cf7ce 100644 --- 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 b246883..ffb7c6b 100644 --- a/dockerfiles/ubuntu-14.04 +++ b/dockerfiles/ubuntu-14.04 @@ -4,6 +4,11 @@ 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 \ git \ diff --git a/tests/run-tests.sh b/tests/run-all-tests.sh index 9c92741..9c92741 100755 --- a/tests/run-tests.sh +++ b/tests/run-all-tests.sh |