switch to the new container based infrastructure

This commit is contained in:
Matthias Mailänder
2015-07-26 13:01:57 +02:00
parent 03ace48031
commit 0c2934a536
2 changed files with 12 additions and 5 deletions

View File

@@ -4,13 +4,21 @@
language: csharp language: csharp
mono: 3.12.0 mono: 3.12.0
# Don't use the container based infrastructure # http://docs.travis-ci.com/user/migrating-from-legacy
sudo: true sudo: false
cache: cache:
directories: directories:
- thirdparty/download - thirdparty/download
addons:
apt:
packages:
- nsis
- nsis-common
- dpkg
- markdown
# Environment variables # Environment variables
env: env:
secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs=" secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs="
@@ -20,7 +28,6 @@ env:
# Check source code with StyleCop # Check source code with StyleCop
# call OpenRA to check for YAML errors # call OpenRA to check for YAML errors
script: script:
- sudo apt-get remove nuget # https://github.com/travis-ci/travis-ci/issues/3940
- travis_retry make all-dependencies - travis_retry make all-dependencies
- make all - make all
- make check - make check
@@ -50,7 +57,6 @@ notifications:
skip_join: true skip_join: true
before_deploy: before_deploy:
- sudo apt-get install nsis nsis-common dpkg markdown
- export PATH=$PATH:$HOME/usr/bin - export PATH=$PATH:$HOME/usr/bin
- DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"` - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
- cd packaging - cd packaging

View File

@@ -13,7 +13,8 @@ download_dir="${0%/*}/download"
mkdir -p "${download_dir}" mkdir -p "${download_dir}"
cd "${download_dir}" cd "${download_dir}"
if which nuget >/dev/null 2>&1; then # https://github.com/travis-ci/travis-ci/issues/3940
if [ ! $TRAVIS ] && which nuget >/dev/null 2>&1; then
get() get()
{ {
nuget install $1 -Version $2 -ExcludeVersion nuget install $1 -Version $2 -ExcludeVersion