From 65f017acc9ecf16a16fd03e07f970b1729b6c641 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 8 Feb 2016 08:03:56 +0000 Subject: [PATCH] Revert "Make travis fetch the mod content before running tests." This reverts commit 1f4269df764c5bca80aee3a197e019e6a45a1085. --- .travis.yml | 3 --- thirdparty/fetch-travis-assets.sh | 43 ------------------------------- 2 files changed, 46 deletions(-) delete mode 100755 thirdparty/fetch-travis-assets.sh diff --git a/.travis.yml b/.travis.yml index b9f7db3e8a..9e2e6e1614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ sudo: false cache: directories: - thirdparty/download - - Support/Content addons: apt: @@ -27,14 +26,12 @@ env: # Fetch dependencies # Run the build script -# Fetch mod assets # Check source code with StyleCop # call OpenRA to check for YAML errors # Run the NUnit tests script: - travis_retry make all-dependencies - make all - - travis_retry ./thirdparty/fetch-travis-assets.sh - make check - make check-scripts - make test diff --git a/thirdparty/fetch-travis-assets.sh b/thirdparty/fetch-travis-assets.sh deleted file mode 100755 index 9219c5bb86..0000000000 --- a/thirdparty/fetch-travis-assets.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# Die on any error for Travis CI to automatically retry: -set -e -if [ ! -e ./Support/Content/ra/conquer.mix ]; then - echo "Downloading RA mod content" - mkdir -p ./Support/Content/ra/ - cd ./Support/Content/ra/ - curl -s -L -O `curl -s -L http://www.openra.net/packages/ra-mirrors.txt | head -n1` - unzip ra-packages.zip - rm ra-packages.zip - cd ../../../ -fi - -if [ ! -e ./Support/Content/cnc/conquer.mix ]; then - echo "Downloading TD mod content" - mkdir -p ./Support/Content/cnc/ - cd ./Support/Content/cnc/ - curl -s -L -O `curl -s -L http://www.openra.net/packages/cnc-mirrors.txt | head -n1` - unzip cnc-packages.zip - rm cnc-packages.zip - cd ../../../ -fi - -if [ ! -e ./Support/Content/d2k/DATA.R8 ]; then - echo "Downloading D2K mod content" - mkdir -p ./Support/Content/d2k/ - cd ./Support/Content/d2k/ - curl -s -L -O `curl -s -L http://www.openra.net/packages/d2k-103-mirrors.txt | head -n1` - unzip d2k-103-packages.zip - rm d2k-103-packages.zip - cd ../../../ -fi - -if [ ! -e ./Support/Content/ts/conquer.mix ]; then - echo "Downloading TS mod content" - mkdir -p ./Support/Content/ts/ - cd ./Support/Content/ts/ - curl -s -L -O `curl -s -L http://www.openra.net/packages/ts-mirrors.txt | head -n1` - unzip ts-packages.zip - rm ts-packages.zip - cd ../../../ -fi