From ee7c24eb5d111459e0ff05797ec84fa42e5a95e6 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 13 Nov 2019 18:29:49 -0800 Subject: [PATCH] Revert "Port .travis.yml from https://github.com/MyHush/SilentDragonLite/blob/denio/.travis.yml" This reverts commit 5c7445477f8c86e8d1a92729af88b8cbe4e49f79. --- .travis.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2de77ff..0625090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,19 @@ -language: rust matrix: include: # works on Precise and Trusty - os: linux - - dist: xenial compiler: clang addons: apt: sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7'] packages: ['clang-3.7', 'g++-8'] -before_script: - - export PATH="$PATH:$HOME/.cargo/bin" - before_install: - - gem install bundler - - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal - - export PATH="$PATH:$HOME/.cargo/bin" - - sudo add-apt-repository ppa:beineri/opt-qt591-xenial -y + - sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y - sudo apt-get update -qq - - sudo apt-get install qt59base qt59websockets libgl1-mesa-dev + - sudo apt-get install qt59base qt59websockets - source /opt/qt59/bin/qt59-env.sh - script: - qmake -v - clang++ -v @@ -33,3 +24,4 @@ script: - qmake silentdragon.pro CONFIG+=release -spec linux-g++ - res/libsodium/buildlibsodium.sh - make CC=gcc-8 CXX=g++-8 -j2 + \ No newline at end of file