Skip to content

Commit

Permalink
Done. Probably needs a the ignore updated as well as the dockerfile.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jalleo authored and Jalleo committed Jan 10, 2019
1 parent 9123680 commit 3768426
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ before_script:
- tools/travis/before_build_byond.sh

script:
- tools/travis/check_filedirs.sh StarTrekking.dme
- tools/travis/check_filedirs.sh DeepSpace13.dme
- tools/travis/build_tools.sh || travis_terminate 1
- tools/travis/build_dependencies.sh || travis_terminate 1
- tools/travis/build_byond.sh
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ -d ".git" ]; then
cp -r .git/logs/* $1/.git/logs/
fi

cp StarTrekking.dmb StarTrekking.rsc $1/
cp DeepSpace13.dmb StarTrekking.rsc $1/
cp -r _maps/* $1/_maps/
cp icons/default_title.dmi $1/icons/
cp -r sound/chatter/* $1/sound/chatter/
Expand Down
4 changes: 2 additions & 2 deletions tools/linux_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def stage2(map):
txt = "-M{}".format(map)
else:
txt = ''
args = "bash tools/travis/dm.sh {} StarTrekking.dme".format(txt)
args = "bash tools/travis/dm.sh {} DeepSpace13.dme".format(txt)
print(args)
p = subprocess.Popen(args, shell=True)
wait(p)
Expand All @@ -42,7 +42,7 @@ def stage3(profile_mode=False):
play("sound/misc/compiler-stage2.ogg")
logfile = open('server.log~','w')
p = subprocess.Popen(
"DreamDaemon StarTrekking.dmb 25001 -trusted",
"DreamDaemon DeepSpace13.dmb 25001 -trusted",
shell=True, stdout=PIPE, stderr=STDOUT)
try:
while p.returncode is None:
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/build_byond.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if [ "$BUILD_TOOLS" = false ]; then

cd travis_test
ln -s $HOME/libmariadb/libmariadb.so libmariadb.so
DreamDaemon StarTrekking.dmb -close -trusted -verbose -params "test-run&log-directory=travis"
DreamDaemon DeepSpace13.dmb -close -trusted -verbose -params "test-run&log-directory=travis"
cd ..
cat travis_test/data/logs/travis/clean_run.lk

Expand Down

0 comments on commit 3768426

Please sign in to comment.