mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
Merge branch 'sg/travis-fixes'
Assorted updates for TravisCI integration. * sg/travis-fixes: travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh' travis-ci: move setting environment variables to 'ci/lib-travisci.sh' travis-ci: introduce a $jobname variable for 'ci/*' scripts
This commit is contained in:
commit
f62b471d21
3 changed files with 39 additions and 29 deletions
26
.travis.yml
26
.travis.yml
|
@ -21,30 +21,14 @@ addons:
|
||||||
- git-svn
|
- git-svn
|
||||||
- apache2
|
- apache2
|
||||||
|
|
||||||
env:
|
|
||||||
global:
|
|
||||||
- DEVELOPER=1
|
|
||||||
# The Linux build installs the defined dependency versions below.
|
|
||||||
# The OS X build installs the latest available versions. Keep that
|
|
||||||
# in mind when you encounter a broken OS X build!
|
|
||||||
- LINUX_P4_VERSION="16.2"
|
|
||||||
- LINUX_GIT_LFS_VERSION="1.5.2"
|
|
||||||
- DEFAULT_TEST_TARGET=prove
|
|
||||||
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
|
|
||||||
- GIT_TEST_OPTS="--verbose-log"
|
|
||||||
- GIT_TEST_CLONE_2GB=YesPlease
|
|
||||||
# t9810 occasionally fails on Travis CI OS X
|
|
||||||
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
|
|
||||||
- GIT_SKIP_TESTS="t9810 t9816"
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- env: GETTEXT_POISON=YesPlease
|
- env: jobname=GETTEXT_POISON
|
||||||
os: linux
|
os: linux
|
||||||
compiler:
|
compiler:
|
||||||
addons:
|
addons:
|
||||||
before_install:
|
before_install:
|
||||||
- env: Windows
|
- env: jobname=Windows
|
||||||
os: linux
|
os: linux
|
||||||
compiler:
|
compiler:
|
||||||
addons:
|
addons:
|
||||||
|
@ -55,7 +39,7 @@ matrix:
|
||||||
test "$TRAVIS_REPO_SLUG" != "git/git" ||
|
test "$TRAVIS_REPO_SLUG" != "git/git" ||
|
||||||
ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
|
ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
|
||||||
after_failure:
|
after_failure:
|
||||||
- env: Linux32
|
- env: jobname=Linux32
|
||||||
os: linux
|
os: linux
|
||||||
compiler:
|
compiler:
|
||||||
services:
|
services:
|
||||||
|
@ -63,7 +47,7 @@ matrix:
|
||||||
before_install:
|
before_install:
|
||||||
before_script:
|
before_script:
|
||||||
script: ci/run-linux32-docker.sh
|
script: ci/run-linux32-docker.sh
|
||||||
- env: Static Analysis
|
- env: jobname=StaticAnalysis
|
||||||
os: linux
|
os: linux
|
||||||
compiler:
|
compiler:
|
||||||
addons:
|
addons:
|
||||||
|
@ -74,7 +58,7 @@ matrix:
|
||||||
before_script:
|
before_script:
|
||||||
script: ci/run-static-analysis.sh
|
script: ci/run-static-analysis.sh
|
||||||
after_failure:
|
after_failure:
|
||||||
- env: Documentation
|
- env: jobname=Documentation
|
||||||
os: linux
|
os: linux
|
||||||
compiler:
|
compiler:
|
||||||
addons:
|
addons:
|
||||||
|
|
|
@ -8,10 +8,8 @@
|
||||||
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
|
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
|
||||||
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
|
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
|
||||||
|
|
||||||
case "${TRAVIS_OS_NAME:-linux}" in
|
case "$jobname" in
|
||||||
linux)
|
linux-clang|linux-gcc)
|
||||||
export GIT_TEST_HTTPD=YesPlease
|
|
||||||
|
|
||||||
mkdir --parents "$P4_PATH"
|
mkdir --parents "$P4_PATH"
|
||||||
pushd "$P4_PATH"
|
pushd "$P4_PATH"
|
||||||
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
|
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
|
||||||
|
@ -26,7 +24,7 @@ linux)
|
||||||
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
|
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
|
||||||
popd
|
popd
|
||||||
;;
|
;;
|
||||||
osx)
|
osx-clang|osx-gcc)
|
||||||
brew update --quiet
|
brew update --quiet
|
||||||
# Uncomment this if you want to run perf tests:
|
# Uncomment this if you want to run perf tests:
|
||||||
# brew install gnu-time
|
# brew install gnu-time
|
||||||
|
|
|
@ -23,14 +23,42 @@ skip_branch_tip_with_tag () {
|
||||||
|
|
||||||
# Set 'exit on error' for all CI scripts to let the caller know that
|
# Set 'exit on error' for all CI scripts to let the caller know that
|
||||||
# something went wrong
|
# something went wrong
|
||||||
set -e
|
set -ex
|
||||||
|
|
||||||
skip_branch_tip_with_tag
|
skip_branch_tip_with_tag
|
||||||
|
|
||||||
case "${TRAVIS_OS_NAME:-linux}" in
|
if test -z "$jobname"
|
||||||
linux)
|
then
|
||||||
|
jobname="$TRAVIS_OS_NAME-$CC"
|
||||||
|
fi
|
||||||
|
|
||||||
|
export DEVELOPER=1
|
||||||
|
export DEFAULT_TEST_TARGET=prove
|
||||||
|
export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
|
||||||
|
export GIT_TEST_OPTS="--verbose-log"
|
||||||
|
export GIT_TEST_CLONE_2GB=YesPlease
|
||||||
|
|
||||||
|
case "$jobname" in
|
||||||
|
linux-clang|linux-gcc)
|
||||||
|
export GIT_TEST_HTTPD=YesPlease
|
||||||
|
|
||||||
|
# The Linux build installs the defined dependency versions below.
|
||||||
|
# The OS X build installs the latest available versions. Keep that
|
||||||
|
# in mind when you encounter a broken OS X build!
|
||||||
|
export LINUX_P4_VERSION="16.2"
|
||||||
|
export LINUX_GIT_LFS_VERSION="1.5.2"
|
||||||
|
|
||||||
P4_PATH="$(pwd)/custom/p4"
|
P4_PATH="$(pwd)/custom/p4"
|
||||||
GIT_LFS_PATH="$(pwd)/custom/git-lfs"
|
GIT_LFS_PATH="$(pwd)/custom/git-lfs"
|
||||||
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
|
export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
|
||||||
;;
|
;;
|
||||||
|
osx-clang|osx-gcc)
|
||||||
|
# t9810 occasionally fails on Travis CI OS X
|
||||||
|
# t9816 occasionally fails with "TAP out of sequence errors" on
|
||||||
|
# Travis CI OS X
|
||||||
|
export GIT_SKIP_TESTS="t9810 t9816"
|
||||||
|
;;
|
||||||
|
GETTEXT_POISON)
|
||||||
|
export GETTEXT_POISON=YesPlease
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in a new issue