diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-06-18 02:05:55 +0000 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-06-18 02:06:34 +0000 |
| commit | be9c1ec35c022e91e944ee2e77020aac2e2c8b8c (patch) | |
| tree | db58751fcc94edee4e9c701047ae1841fa5b35cb /.travis.yml | |
| parent | 329e1da5cdaf731b44b46775113e14773d4a1482 (diff) | |
Revert "travis: add -e to ci script."
This reverts commit 5d0fec3363c571040ebf3cd065d32b0e00008472.
"set -e" breaks all macOS builds after completing the script block.
Change-Id: I5c297fd4b1b816d3143fa8fd8a51eb848c7c2de4
Reviewed-on: https://code.wireshark.org/review/33638
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 5d212a95fb..3574cf0ff6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,6 @@ before_script: - if [ "$TRAVIS_OS_NAME" != "windows" ]; then cmake -GNinja -DENABLE_PCAP=${PCAP} ..; fi - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake -A $PLATFORM ..; fi script: - - set -e # Enable parallelism for msbuild too (since CMake 3.12; ninja does not need it) - export CMAKE_BUILD_PARALLEL_LEVEL=0 - if [ "$TRAVIS_OS_NAME" == "windows" ]; then cmake() { ../tools/filter-msbuild.py cmake "$@"; }; fi |