From 454506a6750439bbfc19c7d75a424a34eb9beb2a Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 17 Sep 2018 02:44:59 -0300 Subject: [PATCH] Add format checking to travis --- .travis.yml | 193 ++++++++++++++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 95 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98b41c9626..f189a3567f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,107 +3,110 @@ dist: trusty sudo: required matrix: - include: - - env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF - WITH_FFMPEG_JOBS=1 - os: osx - - env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF - WITH_FFMPEG_JOBS=1 - compiler: clang - addons: &1 - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.6 - packages: - - nasm - - libudev-dev - - clang-3.6 - - libmad0-dev - - libgtk2.0-dev - - binutils-dev - - libasound-dev - - libpulse-dev - - libjack-dev - - libc6-dev - - libogg-dev - - libvorbis-dev - - libxtst-dev - - libxrandr-dev - - libglew-dev - - libuv-dev - - env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=ON - WITH_FFMPEG_JOBS=1 - compiler: clang - addons: *1 - - env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1 MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - nasm - - libudev-dev - - gcc-5 - - g++-5 - - libmad0-dev - - libgtk2.0-dev - - binutils-dev - - libasound-dev - - libpulse-dev - - libjack-dev - - libc6-dev - - libogg-dev - - libvorbis-dev - - libxtst-dev - - libxrandr-dev - - libglew-dev - - libuv-dev - coverity_scan: - project: - name: etternagame/etterna - description: "Build submitted via Travis CI" - notification_email: etternadev@gmail.com - build_command_prepend: "cov-configure --comptype g++ --compiler g++-5 --template" - build_command: "make -j 4" - branch_pattern: coverity_scan + include: + - env: + CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF + WITH_FFMPEG_JOBS=1 + os: osx + - env: + CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF + WITH_FFMPEG_JOBS=1 + compiler: clang + addons: &1 + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 + packages: + - nasm + - libudev-dev + - clang-3.6 + - libmad0-dev + - libgtk2.0-dev + - binutils-dev + - libasound-dev + - libpulse-dev + - libjack-dev + - libc6-dev + - libogg-dev + - libvorbis-dev + - libxtst-dev + - libxrandr-dev + - libglew-dev + - libuv-dev + - env: + CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=ON + WITH_FFMPEG_JOBS=1 + compiler: clang + addons: *1 + - env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1 MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - nasm + - libudev-dev + - gcc-5 + - g++-5 + - libmad0-dev + - libgtk2.0-dev + - binutils-dev + - libasound-dev + - libpulse-dev + - libjack-dev + - libc6-dev + - libogg-dev + - libvorbis-dev + - libxtst-dev + - libxrandr-dev + - libglew-dev + - libuv-dev + coverity_scan: + project: + name: etternagame/etterna + description: "Build submitted via Travis CI" + notification_email: etternadev@gmail.com + build_command_prepend: "cov-configure --comptype g++ --compiler g++-5 --template" + build_command: "make -j 4" + branch_pattern: coverity_scan before_script: - - if [ "${CXX_COMPILER}" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi - - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi - - git submodule update --init - - mkdir ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build - - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl; - export LIBRARY_SEARCH_PATHS=${TRAVIS_BUILD_DIR}/Xcode/Libraries; - export LIBRARY_PATH=${TRAVIS_BUILD_DIR}/Xcode/Libraries; - brew install --HEAD libuv --universal; - brew install yasm; - brew install nasm; - brew uninstall libuv; - brew install libuv --universal; - brew uninstall openssl; - brew install openssl --universal; - brew uninstall zlib; - brew install zlib --universal; - cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..; fi + - if [ "${CXX_COMPILER}" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi + - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi + - git submodule update --init + - mkdir ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build + - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl; + export LIBRARY_SEARCH_PATHS=${TRAVIS_BUILD_DIR}/Xcode/Libraries; + export LIBRARY_PATH=${TRAVIS_BUILD_DIR}/Xcode/Libraries; + brew install --HEAD libuv --universal; + brew install yasm; + brew install nasm; + brew uninstall libuv; + brew install libuv --universal; + brew uninstall openssl; + brew install openssl --universal; + brew uninstall zlib; + brew install zlib --universal; + cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..; fi script: - - if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j 4; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target Etterna -destination 'platform=OS X,arch=x86_64' -xcconfig ../Xcode/conf.cnf -configuration RelWithDebInfo; - mv ../*.app ../Etterna.app; - xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target dmg -configuration RelWithDebInfo; fi + - if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j 4; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target Etterna -destination 'platform=OS X,arch=x86_64' -xcconfig ../Xcode/conf.cnf -configuration RelWithDebInfo; + mv ../*.app ../Etterna.app; + xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target dmg -configuration RelWithDebInfo; fi before_install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.2.6; - gem install dropbox-deployment; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.2.6; + gem install dropbox-deployment; fi after_success: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd ${TRAVIS_BUILD_DIR}; - ruby uploadDmg.rb; fi - - format-check.sh - + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd ${TRAVIS_BUILD_DIR}; + ruby uploadDmg.rb; fi + - format-check.sh + env: - global: - secure: gXXVXUQdzic8X/WhHgPih7zEPOMvzz1o4XudnEgiIGrk5gwVajXLVc0TEVT9uogeuHZxhT0sM7idYmtSXTe6zUBfoV/WXnyfeZVQhI59iy35bWUKdbpPpO9bAafdmMB2d9b3v5QT8iubOPAudVNGENBZiXiGovAJBmqxnjpjdU1aQBsy5rhFssSOcizIV7GrOcsCGoilTceonPtLp8xX2mt/WQJhPHrAUmZks5uPNNYDXv9a8BoLeTYKzbFoz7GNvoxEUfmFV2W2jr/szfpnbmvRMqKgErsJDlc2b/oaD0EKUJOdu8eNNuOpLKZSPiMQstmDZtQ65boOuXVudAx3T1zFaDhhP3PZwG6KLwnrf0ttLRSdIW5Mm+SzEHuJXp2qwBPyAQJIKJLqqu/OUeNorWfz0jFvYyVlNZlTX5ZaxjEj05qj3DAEfokCuueNY+KFccdouMQX0ks3of4/WKLYH1BL743Binc5SYgK38xA7bzwcjFyyEBQFoc9FayrLkk0Yi/ed2mV1XdBvr7vmFxYDlZQkg425KLtCX7GN/++5FVF01IH1cZa3siJ7XT5EJBu6vxisByHRwPSWWagn2WgvkxHjgAnBcvgYBIcoKsxFBytsyyh3g5fVSWovSnTerr5glwv7cXdyhMAXp1gGL900tjij0BiEWRzKfbiroDjVn0= + global: + secure: gXXVXUQdzic8X/WhHgPih7zEPOMvzz1o4XudnEgiIGrk5gwVajXLVc0TEVT9uogeuHZxhT0sM7idYmtSXTe6zUBfoV/WXnyfeZVQhI59iy35bWUKdbpPpO9bAafdmMB2d9b3v5QT8iubOPAudVNGENBZiXiGovAJBmqxnjpjdU1aQBsy5rhFssSOcizIV7GrOcsCGoilTceonPtLp8xX2mt/WQJhPHrAUmZks5uPNNYDXv9a8BoLeTYKzbFoz7GNvoxEUfmFV2W2jr/szfpnbmvRMqKgErsJDlc2b/oaD0EKUJOdu8eNNuOpLKZSPiMQstmDZtQ65boOuXVudAx3T1zFaDhhP3PZwG6KLwnrf0ttLRSdIW5Mm+SzEHuJXp2qwBPyAQJIKJLqqu/OUeNorWfz0jFvYyVlNZlTX5ZaxjEj05qj3DAEfokCuueNY+KFccdouMQX0ks3of4/WKLYH1BL743Binc5SYgK38xA7bzwcjFyyEBQFoc9FayrLkk0Yi/ed2mV1XdBvr7vmFxYDlZQkg425KLtCX7GN/++5FVF01IH1cZa3siJ7XT5EJBu6vxisByHRwPSWWagn2WgvkxHjgAnBcvgYBIcoKsxFBytsyyh3g5fVSWovSnTerr5glwv7cXdyhMAXp1gGL900tjij0BiEWRzKfbiroDjVn0=