Some CI fixes

Change-Id: Ieaf5302599a83f35ceaf3c4c8ffbe63c03619d98

ci/travis_env_common.sh

@@ -23,7 +23,7 @@ export MINICONDA=$HOME/miniconda
 export CONDA_PKGS_DIRS=$HOME/.conda_packages
 export CONDA_BINUTILS_VERSION=2.31
 
-export ARROW_LLVM_VERSION=7.0
+export ARROW_LLVM_VERSION=7
 export CONDA_LLVM_VERSION="7.0.*"
 
 export ARROW_CPP_DIR=$TRAVIS_BUILD_DIR/cpp

ci/travis_install_clang_tools.sh

@@ -25,6 +25,5 @@ source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
 sudo apt-add-repository -y \
      "deb https://llvm.org/apt/$DISTRO_CODENAME/ llvm-toolchain-$DISTRO_CODENAME-$ARROW_LLVM_VERSION main"
->>>>>>> Build project with LLVM 7. Add option to disable using ld.gold
 sudo apt-get update -qq
 sudo apt-get install -q clang-$ARROW_LLVM_VERSION clang-format-$ARROW_LLVM_VERSION clang-tidy-$ARROW_LLVM_VERSION

ci/travis_install_linux.sh

@@ -44,7 +44,7 @@ fi
 set -x
 if [ "$DISTRO_CODENAME" != "trusty" ]; then
     if [ "$ARROW_TRAVIS_GANDIVA" == "1" ]; then
-        sudo apt-get install -y -qq llvm-6.0-dev
+        sudo apt-get install -y -qq llvm-$ARROW_LLVM_VERSION-dev
     fi
 
     sudo apt-get install -y -qq maven