Skip to content
Snippets Groups Projects
Commit f7f96b4eeef9 authored by Ingy döt Net's avatar Ingy döt Net
Browse files

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.
parent 9ced5b71e0cb
No related branches found
No related tags found
No related merge requests found
language: c
matrix: matrix:
include: include:
- os: linux - os: linux
...@@ -1,5 +2,6 @@ ...@@ -1,5 +2,6 @@
matrix: matrix:
include: include:
- os: linux - os: linux
compiler: gcc
sudo: required sudo: required
...@@ -5,3 +7,2 @@ ...@@ -5,3 +7,2 @@
sudo: required sudo: required
compiler: gcc
- os: linux - os: linux
...@@ -7,2 +8,3 @@ ...@@ -7,2 +8,3 @@
- os: linux - os: linux
compiler: clang
sudo: required sudo: required
...@@ -8,7 +10,6 @@ ...@@ -8,7 +10,6 @@
sudo: required sudo: required
compiler: clang
- os: osx - os: osx
compiler: gcc compiler: gcc
- os: osx - os: osx
compiler: clang compiler: clang
...@@ -10,7 +11,11 @@ ...@@ -10,7 +11,11 @@
- os: osx - os: osx
compiler: gcc compiler: gcc
- os: osx - os: osx
compiler: clang compiler: clang
language: c before_install:
# Travis branch-specific clone problem workaround:
- git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
- git fetch
...@@ -16,4 +21,6 @@ ...@@ -16,4 +21,6 @@
before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user scikit-ci-addons==0.15.0; ci_addons travis/install_cmake 3.2.0; fi pip install --user scikit-ci-addons==0.15.0;
ci_addons travis/install_cmake 3.2.0;
fi
...@@ -19,2 +26,2 @@ ...@@ -19,2 +26,2 @@
script: tests/run-tests.sh script: tests/run-all-tests.sh
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
pkgconfig_DATA = yaml-0.1.pc pkgconfig_DATA = yaml-0.1.pc
maintainer-clean-local: 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 '{}' ';' -find ${builddir} -name Makefile.in -exec rm -f '{}' ';'
distclean-local: distclean-local:
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
-find ${builddir} -name Makefile.in -exec rm -f '{}' ';' -find ${builddir} -name Makefile.in -exec rm -f '{}' ';'
distclean-local: distclean-local:
-rm -fr tests/run-test-suite rm -fr tests/run-test-suite
-git worktree prune -git worktree prune
.PHONY: bootstrap .PHONY: bootstrap
...@@ -31,5 +31,6 @@ ...@@ -31,5 +31,6 @@
test-all: test test-suite test-all: test test-suite
tests/run-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 git worktree add $@ run-test-suite
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ 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 \ autoconf \
build-essential \ build-essential \
git \ git \
......
#!/bin/sh
set -e
main() {
# Autoconf based in-source build and tests
clean
./bootstrap
./configure
make test-all
# CMake based in-source build and tests
clean
cmake .
make
make test
clean
}
clean() {
git clean -d -x -f
rm -fr tests/run-test-suite
git worktree prune
}
main "$@"
#!/bin/sh
set -e
main() {
# Autoconf based in-source build and tests
clean
./bootstrap
./configure
make test-all
# CMake based in-source build and tests
clean
cmake .
make
make test
clean
}
clean() {
git clean -d -x -f
rm -fr tests/run-test-suite
git worktree prune
}
main "$@"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment