michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix .travis files

Browse source 
- OSX sed expects parameter for "-i" option
- for Windows and OSX build, we need to get the commit hash of HEAD~
  instead of HEAD because we made an extra commit to trigger the build
This commit is contained in:
Soonho Kong 2013-09-05 20:53:21 -07:00
parent d9bca66585
commit f3f74b9ff5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.osx.yml
View file

@ -21,7 +21,7 @@ before_script:
script:
- cd build
- SITE=OSX10.8.2@Travis
- GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`
- GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`
- if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then
BUILD_TYPE=Release;
else
@ -29,11 +29,11 @@ script:
fi
- BUILD_NAME=${TRAVIS_BRANCH}_${GIT_COMMIT}_g++-4.9.0_${BUILD_TYPE}
- CONFIG_FILE=DartConfiguration.tcl
- sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
- sed -i "" "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
- sed -i "" "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
- ctest -D ExperimentalConfigure
- sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
- sed -i "" "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
- sed -i "" "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
- ctest -D ExperimentalBuild -VV
- yes "C" | ctest -D ExperimentalTest -VV
- cd ..

2
.travis.windows.yml
View file

@ -28,7 +28,7 @@ script:
- cd build
- cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../src -DCMAKE_TOOLCHAIN_FILE=/tmp/mxe/usr/x86_64-w64-mingw32/share/cmake/mxe-conf.cmake
- SITE=Windows@Travis
- GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`
- GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`
- if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then
BUILD_TYPE=Release;
else