summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRene Rivera <grafikrobot@gmail.com>2016-03-20 23:29:51 -0500
committerRene Rivera <grafikrobot@gmail.com>2016-03-20 23:29:51 -0500
commit11da8f8fafc4ba6b3e577e63abb7dc45cb902e2f (patch)
treecc8d957357428e81b5f57a64fac9cb5d1a270206 /.travis.yml
parent3a94cde635254f92fa87e0e11ef52d08684b8225 (diff)
downloadboost-11da8f8fafc4ba6b3e577e63abb7dc45cb902e2f.tar.gz
Fix incorrect EOL for Windows archives. And hardcode archive dir, and
name, to current release.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index da14b1e9aa..67045151df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,7 +85,7 @@ before_script:
if [[ "${RELEASE_BUILD}" == "LF" ]]; then
cd "${TRAVIS_BUILD_DIR}"
git config core.eol lf
- git config core.autocrlf false
+ git config core.autocrlf input
git rm --cache -r .
git reset --quiet --hard HEAD
git submodule update --init --recursive
@@ -94,7 +94,7 @@ before_script:
if [[ "${RELEASE_BUILD}" == "CRLF" ]]; then
cd "${TRAVIS_BUILD_DIR}"
git config core.eol crlf
- git config core.autocrlf false
+ git config core.autocrlf true
git rm --cache -r .
git reset --quiet --hard HEAD
git submodule update --init --recursive
@@ -202,7 +202,7 @@ script:
cd "${TRAVIS_BUILD_DIR}/.."
wget "https://raw.githubusercontent.com/boostorg/release-tools/develop/MakeBoostDistro.py"
chmod +x MakeBoostDistro.py
- export BOOST_RELEASE=boost_${TRAVIS_BRANCH}_${TRAVIS_COMMIT}
+ export BOOST_RELEASE=boost_1_61_0_b1_rc2
./MakeBoostDistro.py "${TRAVIS_BUILD_DIR}" "${BOOST_RELEASE}"
fi