From b42446da35a1d61539acd3209dbd09fd060c8ed7 Mon Sep 17 00:00:00 2001 From: Linus_Probert Date: Mon, 19 Mar 2018 11:00:22 +0100 Subject: [PATCH] Minor travis changes to wrestle with coverity_scan --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bc4a1c..441f4d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ compiler: env: global: - - secure: "sM7ZGPk1dw74Ujy/JmEoJoPlVtFX3OOioEPfRDKHxW0KTlyy3vV7+zVbGZ74SoktCoLJHIFL86kN3MfX4R3FyKiOGbvDn+f6/AbsJlCnx7CtIbgjds0JA18PA1njPHAVG2po1Bdi6H8txtgPkOpjmMETvVnJPQep1uxr8Y0bViIUay8izeLn4hv02p/ZpLrtfXCcDvn5CwwPk98cELfZJPWJi3VM7JYHat4pb5M1dUoo3GcaMpWQS2B22uimU3cF76GL+IFn9hgZLJsxeQeCj0Ju7NVV1qp34tthgalfSc//ETj+EilIeh8PAuImGQyBdjav3eErC9RP6bI1OjDSoX9FEruUNhnf8kXhrFvk+poOPjBWCg7WPv5rXdhKPyPaVH7apfV+V6572obkyP9wNKWTUQOSW35XmmsEaeMSPrmbQ6t9vR2w35o3Fd0IFdy0IIAYU1KRuC1c3VT3KUKwCKsuXROXqxkxNHJ1i4IF4TV0Egl3t2chOaTqwqiY+6+6wjMw3mfIQxd96SSYKUBCi9H9uBC2H/YCIIp8hznbWAs4mfqw0eEYliI0NFvLbIIOYHNiYTEqQvFM9kmDZsyRljP6zak+Zp62Mp5Bv1zwi8+VIzr9Ig7jmrA0G4f3rJQbnICDNaLpf1Y5lqRjVazxzUyisp+ZdY+ZYyDJyBnen9g=" + - secure: "XH9gOl7zX+QqtMhh1zAAcoNp0dIGpZOCKu1rs1tZSuOispXgSnRQ22hypyUHSqnhqh/q1pVoc3zJGk8qCpC8Qur2QcQnr0fP3z7tt7aF8EVqPIt81m+NIhsWQrJookvrKY9212qg0KuTOoPJ+FpNAIMWjtWT9w7DPrvgH2l+Ly6U5/vKGn49Z+rm6bwHdlDH0F1VxuiyXSv99h4Ik5FRB5jao2AWlszvvHOjRNbrZnpM9NTa+WuTOsGMNOxj2jbepu7oaZRuBZNRJDiEf7S84btdZM0wp2hOlhK8hqTCuzGkyV3RYqbYjt7qOucQpUWENtMmdz/E6/EA6t3palZaErOyf/ETy9UC6pw/myDzZfXi1iVwv1spff7pMTbrOa6rycS2M0Osgo0Ah2w5wPEYgT48363EQTN2nw9/5q1enjYJWdTFdACG+eAw5+LMfm3++dEhxht7DZJ/y89mae36b5CcMfWDxZS4CBYjhqDwFkRXgmcMIhqtXqF1zdheXd+zHw2zyYgrE0c/keOcyRvQ/DJzNSkRAPs11t4ETgKf295MzhPs/JXvHffY2Pfgwe09a3mX+fA9IgfL80rqw6d2tmtkoRApdvxT65OLITb+QPsbU4pE8SkgCDwZMvzenL7ChAXwt7vce7rXHJqmLAoaCvpvEor/c0Fbdluxk45hOwg=" before_install: - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- @@ -29,19 +29,11 @@ install: - sudo apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev - sudo apt-get install -y cmake cmake-data check lua5.2 liblua5.2-dev - #g++6 - - if [ "$CXX" = "g++" ]; then sudo apt-get install -y g++-6; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - - #clang 4.0 - - if [ "$CXX" == "clang++" ]; then sudo apt-get install -y clang-4.0; fi - - if [ "$CXX" == "clang++" ]; then export CXX="clang++-4.0"; fi - script: - mkdir build - cd build - cmake --version - - cmake -DCMAKE_BUILD_TYPE=Debug .. + - cmake .. - make - make test @@ -49,8 +41,8 @@ addons: coverity_scan: project: name: "LiquidityC/breakhack" - description: "A rougelike game, inspired by Nethack" + description: "Build submitted via Travis CI" notification_email: linus.probert@gmail.com - build_command_prepend: "mkdir -p build;cd build;cmake -DCMAKE_BUILD_TYPE=Debug .." + build_command_prepend: "mkdir -p build; cd build; cmake .." build_command: "make" branch_pattern: coverity_scan