Merge branch 'ls/travis-homebrew-path-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:45 +0000 (16:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:45 +0000 (16:49 -0700)
The procedure to build Git on Mac OS X for Travis CI hardcoded the
internal directory structure we assumed HomeBrew uses, which was a
no-no. The procedure has been updated to ask HomeBrew things we
need to know to fix this.

* ls/travis-homebrew-path-fix:
travis-ci: ask homebrew for its path instead of hardcoding it

1  2 
.travis.yml
diff --combined .travis.yml
index 477c3d2efb7b94bb34fcda517b1b855e98e1f43a,f0a89cb024f2a978379865ed2e9fd3f559e05e4a..37a1e1fb6d48935aa22a384797ce82a39340b2ed
@@@ -1,11 -1,5 +1,11 @@@
  language: c
  
 +sudo: false
 +
 +cache:
 +  directories:
 +    - $HOME/travis-cache
 +
  os:
    - linux
    - osx
@@@ -18,58 -12,37 +18,58 @@@ addons
    apt:
      packages:
      - language-pack-is
 +    - git-svn
 +    - apache2
  
  env:
    global:
 -    - P4_VERSION="15.2"
 -    - GIT_LFS_VERSION="1.1.0"
 +    - 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.1"
 +    - LINUX_GIT_LFS_VERSION="1.2.0"
      - DEFAULT_TEST_TARGET=prove
 -    - GIT_PROVE_OPTS="--timer --jobs 3"
 +    - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
      - GIT_TEST_OPTS="--verbose --tee"
 -    - CFLAGS="-g -O2 -Wall -Werror"
 +    - GIT_TEST_HTTPD=true
      - 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:
 +  include:
 +    - env: Documentation
 +      os: linux
 +      compiler: clang
 +      addons:
 +        apt:
 +          packages:
 +          - asciidoc
 +          - xmlto
 +      before_install:
 +      before_script:
 +      script: ci/test-documentation.sh
 +      after_failure:
 +
  before_install:
    - >
      case "${TRAVIS_OS_NAME:-linux}" in
      linux)
        mkdir --parents custom/p4
        pushd custom/p4
 -        wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4d
 -        wget --quiet http://filehost.perforce.com/perforce/r$P4_VERSION/bin.linux26x86_64/p4
 +        wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
 +        wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
          chmod u+x p4d
          chmod u+x p4
          export PATH="$(pwd):$PATH"
        popd
        mkdir --parents custom/git-lfs
        pushd custom/git-lfs
 -        wget --quiet https://github.com/github/git-lfs/releases/download/v$GIT_LFS_VERSION/git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz
 -        tar --extract --gunzip --file "git-lfs-linux-amd64-$GIT_LFS_VERSION.tar.gz"
 -        cp git-lfs-$GIT_LFS_VERSION/git-lfs .
 +        wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz
 +        tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
 +        cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
          export PATH="$(pwd):$PATH"
        popd
        ;;
          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 --repository 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
 +      # Uncomment this if you want to run perf tests:
 +      # brew install gnu-time
        brew install git-lfs perforce-server perforce gettext
        brew link --force gettext
        ;;
@@@ -96,8 -67,6 +96,8 @@@
      p4 -V | grep Rev.;
      echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)";
      git-lfs version;
 +    mkdir -p $HOME/travis-cache;
 +    ln -s $HOME/travis-cache/.prove t/.prove;
  
  before_script: make --jobs=2