Skip to content

Commit b7a7245

Browse files
etretr
authored
cleanup travis build file (etr#207)
Remove references to windows specific steps that are now unecessary as windows builds have been moved to appveyor.
1 parent 56c68fa commit b7a7245

File tree

1 file changed

+16
-49
lines changed

1 file changed

+16
-49
lines changed

‎.travis.yml‎

Lines changed: 16 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,80 +9,49 @@ env:
99
- DEBUG="debug" COVERAGE="coverage"
1010
- DEBUG="nodebug" COVERAGE="nocoverage"
1111
- LINKING="static"
12-
before_cache:
13-
- |-
14-
case $TRAVIS_OS_NAME in
15-
windows)
16-
# https://unix.stackexchange.com/a/137322/107554
17-
$msys2 pacman --sync --clean --noconfirm
18-
;;
19-
esac
20-
cache:
21-
directories:
22-
- $HOME/AppData/Local/Temp/chocolatey
23-
- /C/tools/msys64
2412
before_install:
2513
- eval "${MATRIX_EVAL}"
26-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"; fi
27-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then export PATH=$PATH:/usr/local/lib; fi
28-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib; fi
29-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib; fi
30-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then export buildshell=''; fi
14+
- export LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
15+
- export PATH=$PATH:/usr/local/lib
16+
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
17+
- export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib
3118
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install info install-info; fi
3219
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install codecov; fi
3320
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi
3421
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi
3522
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi
3623
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export IPV6_TESTS_ENABLED="true"; fi
37-
- |-
38-
case $TRAVIS_OS_NAME in
39-
windows)
40-
[[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
41-
choco uninstall -y mingw
42-
choco upgrade --no-progress -y msys2
43-
export msys2='cmd //C RefreshEnv.cmd '
44-
export msys2+='& set MSYS=winsymlinks:nativestrict '
45-
export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
46-
export buildshell="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
47-
export msys2+=" -msys2 -c "\"\$@"\" --"
48-
$msys2 pacman --sync --noconfirm --disable-download-timeout --needed mingw-w64-x86_64-toolchain
49-
$msys2 pacman -Syu --noconfirm --disable-download-timeout autoconf libtool automake make autoconf-archive pkg-config mingw-w64-x86_64-libsystre mingw-w64-x86_64-doxygen mingw-w64-x86_64-gnutls mingw-w64-x86_64-graphviz mingw-w64-x86_64-curl
50-
export PATH=/C/tools/msys64/mingw64/bin:$PATH
51-
export MAKE=mingw32-make # so that Autotools can find it
52-
;;
53-
esac
5424
- curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz
5525
- tar -xzf libmicrohttpd-0.9.59.tar.gz
5626
- cd libmicrohttpd-0.9.59
57-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then $buildshell ./configure --disable-examples; else $buildshell ./configure --disable-examples --enable-poll=no; fi;
58-
- $buildshell make
59-
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then sudo make install; else $buildshell make install; fi
27+
- ./configure --disable-examples
28+
- make
29+
- sudo make install
6030
- cd ..
6131
- if [ "$BUILD_TYPE" = "asan" ]; then export CFLAGS='-fsanitize=address'; export CXXLAGS='-fsanitize=address'; export LDFLAGS='-fsanitize=address'; fi
6232
- if [ "$BUILD_TYPE" = "msan" ]; then export CFLAGS='-fsanitize=memory'; export CXXLAGS='-fsanitize=memory'; export LDFLAGS='-fsanitize=memory'; fi
6333
- if [ "$BUILD_TYPE" = "lsan" ]; then export CFLAGS='-fsanitize=leak'; export CXXLAGS='-fsanitize=leak'; export LDFLAGS='-fsanitize=leak'; fi
6434
- if [ "$BUILD_TYPE" = "tsan" ]; then export CFLAGS='-fsanitize=thread'; export CXXLAGS='-fsanitize=thread'; export LDFLAGS='-fsanitize=thread'; fi
6535
- if [ "$BUILD_TYPE" = "ubsan" ]; then export export CFLAGS='-fsanitize=undefined'; export CXXLAGS='-fsanitize=undefined'; export LDFLAGS='-fsanitize=undefined'; fi
6636
install:
67-
- $buildshell ./bootstrap
37+
- ./bootstrap
6838
- mkdir build
6939
- cd build
70-
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export MANIFEST_TOOL='no'; fi
7140
- if [ "$LINKING" = "static" ]; then
72-
$buildshell ../configure --enable-static --disable-fastopen;
41+
../configure --enable-static --disable-fastopen;
7342
elif [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ]; then
74-
$buildshell ../configure --enable-debug --enable-coverage --disable-shared --disable-fastopen;
43+
../configure --enable-debug --enable-coverage --disable-shared --disable-fastopen;
7544
elif [ "$DEBUG" = "debug" ]; then
76-
$buildshell ../configure --enable-debug --disable-shared --disable-fastopen;
45+
../configure --enable-debug --disable-shared --disable-fastopen;
7746
elif [ "$VALGRIND" = "valgrind" ]; then
78-
$buildshell ../configure --enable-debug --disable-fastopen --disable-valgrind-helgrind --disable-valgrind-drd --disable-valgrind-sgcheck;
47+
../configure --enable-debug --disable-fastopen --disable-valgrind-helgrind --disable-valgrind-drd --disable-valgrind-sgcheck;
7948
else
80-
$buildshell ../configure --disable-fastopen;
49+
../configure --disable-fastopen;
8150
fi
82-
- $buildshell make
51+
- make
8352
script:
84-
- $buildshell make check
85-
- $buildshell cat test/test-suite.log
53+
- make check
54+
- cat test/test-suite.log
8655
- if [ "$VALGRIND" = "valgrind" ]; then make check-valgrind; fi;
8756
- if [ "$VALGRIND" = "valgrind" ]; then cat test/test-suite-memcheck.log; fi;
8857
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd ../src/; cppcheck --error-exitcode=1 .; cd ../build; fi
@@ -104,8 +73,6 @@ script:
10473
./benchmark_threads 8080 &
10574
sleep 5 && ab -n 10000000 -c 100 localhost:8080/plaintext
10675
fi
107-
after_script:
108-
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then taskkill //F //PID $(ps -Wla | tr -s ' ' | grep gpg | cut -f2 -d' ') ; fi
10976
after_success:
11077
- if [ "$DEBUG" = "debug" ] && [ "$COVERAGE" = "coverage" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then bash <(curl -s https://codecov.io/bash); fi
11178
matrix:

0 commit comments

Comments
 (0)