epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10722 from pchote/fix-asset-dependency

Browse Source 
Remove asset requirement from dedicated servers and the resource site.
This commit is contained in:
Matthias Mailänder
2016-02-21 17:20:19 +01:00
parent 9d85ddb82c 65f017acc9
commit 65942ecfbf
7 changed files with 33 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -10,7 +10,6 @@ sudo: false
cache: cache:
directories: directories:
- thirdparty/download - thirdparty/download
- Support/Content
addons: addons:
apt: apt:
@@ -27,14 +26,12 @@ env:
# Fetch dependencies # Fetch dependencies
# Run the build script # Run the build script
# Fetch mod assets
# Check source code with StyleCop # Check source code with StyleCop
# call OpenRA to check for YAML errors # call OpenRA to check for YAML errors
# Run the NUnit tests # Run the NUnit tests
script: script:
- travis_retry make all-dependencies - travis_retry make all-dependencies
- make all - make all
- travis_retry ./thirdparty/fetch-travis-assets.sh
- make check - make check
- make check-scripts - make check-scripts
- make test - make test

4
Makefile
View File

@@ -254,19 +254,15 @@ test: utility mods
@echo @echo
@echo "Testing Tiberian Sun mod MiniYAML..." @echo "Testing Tiberian Sun mod MiniYAML..."
@mono --debug OpenRA.Utility.exe ts --check-yaml @mono --debug OpenRA.Utility.exe ts --check-yaml
@mono --debug OpenRA.Utility.exe ts --check-sequence-sprites
@echo @echo
@echo "Testing Dune 2000 mod MiniYAML..." @echo "Testing Dune 2000 mod MiniYAML..."
@mono --debug OpenRA.Utility.exe d2k --check-yaml @mono --debug OpenRA.Utility.exe d2k --check-yaml
@mono --debug OpenRA.Utility.exe d2k --check-sequence-sprites
@echo @echo
@echo "Testing Tiberian Dawn mod MiniYAML..." @echo "Testing Tiberian Dawn mod MiniYAML..."
@mono --debug OpenRA.Utility.exe cnc --check-yaml @mono --debug OpenRA.Utility.exe cnc --check-yaml
@mono --debug OpenRA.Utility.exe cnc --check-sequence-sprites
@echo @echo
@echo "Testing Red Alert mod MiniYAML..." @echo "Testing Red Alert mod MiniYAML..."
@mono --debug OpenRA.Utility.exe ra --check-yaml @mono --debug OpenRA.Utility.exe ra --check-yaml
@mono --debug OpenRA.Utility.exe ra --check-sequence-sprites
##### Launchers / Utilities ##### ##### Launchers / Utilities #####

14
mods/cnc/mod.yaml
View File

@@ -12,13 +12,13 @@ Packages:
. .
$cnc: cnc $cnc: cnc
./mods/common: common ./mods/common: common
speech.mix ~speech.mix
conquer.mix ~conquer.mix
sounds.mix ~sounds.mix
tempicnh.mix ~tempicnh.mix
temperat.mix ~temperat.mix
winter.mix ~winter.mix
desert.mix ~desert.mix
~movies-gdi.mix ~movies-gdi.mix
~movies-nod.mix ~movies-nod.mix
~movies.mix ~movies.mix

2
mods/d2k/mod.yaml
View File

@@ -18,7 +18,7 @@ Packages:
$cnc: cnc $cnc: cnc
./mods/common: common ./mods/common: common
SOUND.RS ~SOUND.RS
d2k|bits d2k|bits
d2k|bits/tex d2k|bits/tex
d2k|bits/xmas d2k|bits/xmas

22
mods/ra/mod.yaml
View File

@@ -14,17 +14,17 @@ Packages:
$cnc: cnc $cnc: cnc
./mods/common: common ./mods/common: common
~main.mix ~main.mix
redalert.mix ~redalert.mix
conquer.mix ~conquer.mix
hires.mix ~hires.mix
local.mix ~local.mix
sounds.mix ~sounds.mix
speech.mix ~speech.mix
allies.mix ~allies.mix
russian.mix ~russian.mix
temperat.mix ~temperat.mix
snow.mix ~snow.mix
interior.mix ~interior.mix
~scores.mix ~scores.mix
~movies1.mix ~movies1.mix
~movies2.mix ~movies2.mix

28
mods/ts/mod.yaml
View File

@@ -32,20 +32,20 @@ Packages:
~sidecd01.mix ~sidecd01.mix
~sidecd02.mix ~sidecd02.mix
~tibsun.mix ~tibsun.mix
cache.mix ~cache.mix
conquer.mix ~conquer.mix
isosnow.mix ~isosnow.mix
isotemp.mix ~isotemp.mix
local.mix ~local.mix
sidec01.mix: sidebar-gdi ~sidec01.mix: sidebar-gdi
sidec02.mix: sidebar-nod ~sidec02.mix: sidebar-nod
sno.mix ~sno.mix
snow.mix ~snow.mix
sounds.mix ~sounds.mix
speech01.mix: speech-gdi ~speech01.mix: speech-gdi
speech02.mix: speech-nod ~speech02.mix: speech-nod
tem.mix ~tem.mix
temperat.mix ~temperat.mix
# Firestorm # Firestorm
~scores01.mix ~scores01.mix
~expand01.mix ~expand01.mix

43
thirdparty/fetch-travis-assets.sh vendored
View File

@@ -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