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/Makefile b/Makefile index 5d68c4ae48..3223a2b5bc 100644 --- a/Makefile +++ b/Makefile @@ -254,19 +254,15 @@ test: utility mods @echo @echo "Testing Tiberian Sun mod MiniYAML..." @mono --debug OpenRA.Utility.exe ts --check-yaml - @mono --debug OpenRA.Utility.exe ts --check-sequence-sprites @echo @echo "Testing Dune 2000 mod MiniYAML..." @mono --debug OpenRA.Utility.exe d2k --check-yaml - @mono --debug OpenRA.Utility.exe d2k --check-sequence-sprites @echo @echo "Testing Tiberian Dawn mod MiniYAML..." @mono --debug OpenRA.Utility.exe cnc --check-yaml - @mono --debug OpenRA.Utility.exe cnc --check-sequence-sprites @echo @echo "Testing Red Alert mod MiniYAML..." @mono --debug OpenRA.Utility.exe ra --check-yaml - @mono --debug OpenRA.Utility.exe ra --check-sequence-sprites ##### Launchers / Utilities ##### diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 4ebdab8809..6054801125 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -12,13 +12,13 @@ Packages: . $cnc: cnc ./mods/common: common - speech.mix - conquer.mix - sounds.mix - tempicnh.mix - temperat.mix - winter.mix - desert.mix + ~speech.mix + ~conquer.mix + ~sounds.mix + ~tempicnh.mix + ~temperat.mix + ~winter.mix + ~desert.mix ~movies-gdi.mix ~movies-nod.mix ~movies.mix diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index db73b1226e..803adf11c9 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -18,7 +18,7 @@ Packages: $cnc: cnc ./mods/common: common - SOUND.RS + ~SOUND.RS d2k|bits d2k|bits/tex d2k|bits/xmas diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 4d6e00a694..ce39ee15a0 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -14,17 +14,17 @@ Packages: $cnc: cnc ./mods/common: common ~main.mix - redalert.mix - conquer.mix - hires.mix - local.mix - sounds.mix - speech.mix - allies.mix - russian.mix - temperat.mix - snow.mix - interior.mix + ~redalert.mix + ~conquer.mix + ~hires.mix + ~local.mix + ~sounds.mix + ~speech.mix + ~allies.mix + ~russian.mix + ~temperat.mix + ~snow.mix + ~interior.mix ~scores.mix ~movies1.mix ~movies2.mix diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 4533b9f2dd..6684bfda44 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -32,20 +32,20 @@ Packages: ~sidecd01.mix ~sidecd02.mix ~tibsun.mix - cache.mix - conquer.mix - isosnow.mix - isotemp.mix - local.mix - sidec01.mix: sidebar-gdi - sidec02.mix: sidebar-nod - sno.mix - snow.mix - sounds.mix - speech01.mix: speech-gdi - speech02.mix: speech-nod - tem.mix - temperat.mix + ~cache.mix + ~conquer.mix + ~isosnow.mix + ~isotemp.mix + ~local.mix + ~sidec01.mix: sidebar-gdi + ~sidec02.mix: sidebar-nod + ~sno.mix + ~snow.mix + ~sounds.mix + ~speech01.mix: speech-gdi + ~speech02.mix: speech-nod + ~tem.mix + ~temperat.mix # Firestorm ~scores01.mix ~expand01.mix 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