]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Revert "travis: Use Clang 4.0 instead of 3.9 due to va_start() warnings"
authorTobias Brunner <tobias@strongswan.org>
Tue, 13 Feb 2018 15:25:46 +0000 (16:25 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 13 Feb 2018 15:25:46 +0000 (16:25 +0100)
The Trusty image used by Travis was updated in December and now has Clang
5.0.0 installed.  So this workaround is not necessary anymore.

This reverts commit f4bd46764143744202b817cf7268aa9e6f4ab5f7.

.travis.yml

index 35c9932f77cab8e7b57a11f9aabafcf26c20d1a6..a17f242d1c13959b706a40094d18d21dd6e9f579 100644 (file)
@@ -10,19 +10,6 @@ compiler:
 before_install:
   - ./scripts/test.sh deps
   - ./scripts/test.sh pydeps
-  # use clang 4.0 instead of 3.9 due to unnecessary va_start() warnings
-  - echo $TRAVIS_OS_NAME
-  - echo $CC
-  - echo $(clang --version)
-  - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" == "clang" ]; then
-      if [[ "$(clang --version)" =~ 3\.9\.[0-9] ]]; then
-        curl http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -;
-        echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main" | sudo tee -a /etc/apt/sources.list;
-        sudo apt-get update -qq;
-        sudo apt-get install -qq clang-4.0;
-        CC=clang-4.0;
-      fi;
-    fi
 
 before_script:
   - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 || true