diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index adab5b89bb..9c63c8c3f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ addons: apt: packages: - language-pack-is + - git-svn + - apache2 env: global: @@ -25,11 +27,11 @@ env: # 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.1" - - LINUX_GIT_LFS_VERSION="1.2.0" + - 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 --tee" + - 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 @@ -54,6 +56,8 @@ before_install: - > case "${TRAVIS_OS_NAME:-linux}" in linux) + export GIT_TEST_HTTPD=YesPlease + mkdir --parents custom/p4 pushd custom/p4 wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d @@ -71,18 +75,12 @@ before_install: popd ;; osx) - brew_force_set_latest_binary_hash () { - FORMULA=$1 - SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2) - sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \ - /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb - } brew update --quiet - brew tap homebrew/binary --quiet - brew_force_set_latest_binary_hash perforce - brew_force_set_latest_binary_hash perforce-server - brew install git-lfs perforce-server perforce gettext + # Uncomment this if you want to run perf tests: + # brew install gnu-time + brew install git-lfs gettext brew link --force gettext + brew install caskroom/cask/perforce ;; esac; echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"; |