This repository was archived by the owner on Jun 25, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +11
-11
lines changed
Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 88 - distribution : arch
99 - distribution : debian-testing
1010 - distribution : debian
11-
11+
1212# matrix:
1313# include:
1414# - os: osx
1515
1616services :
1717 - docker
18-
18+
1919before_install :
2020 - ./ci/update_ci.sh # travis_wait 90 ./ci/update_ci.sh
2121
@@ -24,4 +24,4 @@ script:
2424 - script=clean ./ci/execute.sh
2525 - script=compile CXX=g++ CC=gcc ./ci/execute.sh
2626 - script=static_analysis ./ci/execute.sh
27- - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh
27+ - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh
Original file line number Diff line number Diff line change 11platform :
22 - x64
3-
3+
44environment :
55 MSYSTEM : MSYS
66
@@ -12,5 +12,4 @@ before_build:
1212
1313build_script :
1414 - C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh"
15- - C:\msys64\usr\bin\bash -lc "broadwayd & exit"
16- - C:\msys64\usr\bin\bash -lc "script=compile make_command='make test' C:/projects/jucipp/ci/execute.sh"
15+ - C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' C:/projects/jucipp/ci/execute.sh"
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ if [ "${cmake_command}" == "" ]; then
88 mingw=" mingw32"
99 fi
1010 cmake_command=" cmake -G\" MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
11+ make_command=" make"
1112 else
1213 cmake_command=" cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
1314 fi
@@ -17,8 +18,8 @@ if [ "${make_command}" == "" ]; then
1718 make_command=" make -j 2"
1819fi
1920
20- cd jucipp || ( echo " Can't cd into jucipp" ; return 1)
21- git submodule update --init --recursive
22- mkdir -p build && cd build || ( echo " Error making build directory" ; return 1)
23- sh -c " ${cmake_command} " || ( echo " Cmake configuration failed" ; return 1)
24- exec sh -c " ${make_command} "
21+ cd jucipp || echo " Can't cd into jucipp"
22+ git submodule update --init --recursive # appveyor doesn't checkout recursively
23+ mkdir -p build && cd build || echo " Error making build directory"
24+ sh -c " ${cmake_command} " || echo " Cmake configuration failed"
25+ exec sh -c " ${make_command} "
You can’t perform that action at this time.
0 commit comments