Skip to content
This repository has been archived by the owner on Jul 17, 2020. It is now read-only.

Commit

Permalink
TravisCI fix
Browse files Browse the repository at this point in the history
Travis CI fix pt2
  • Loading branch information
phumberdroz committed Mar 18, 2018
1 parent 72c0e3f commit 469d5b1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .tf47Tools/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@ def createmapvariants():
def replaceTemplates():
path = 'builds'
files = ['mission.sqm', 'description.ext', 'x_client/x_intro.sqf']
cfg['Templates']['VERSION'] = label;
for island in os.listdir(path):
if os.path.isdir(os.path.join(os.path.abspath(path), island)):
cfg['Templates']['ISLAND'] = os.path.splitext(island)[1].strip('.').upper()
curIsland =os.path.splitext(island)[1].strip('.').upper()
for file in files:
for template in cfg['Templates']:
filePath= "{}/{}/{}".format(path,island, file)
inplace_change(filePath, template, cfg['Templates'][template])
inplace_change(filePath, "VERSION", label)
inplace_change(filePath, "ISLAND", curIsland)



def inplace_change(filename, old_string, new_string):
Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ before_install:
pip install github3.py;
pip install PyYAML;
docker pull acemod/armake;
docker run -v `pwd`:/data/ acemod/armake /bin/bash -c "cd /data/.tf47Tools; pip install PyYAML; python3 build.py";
docker run -e TRAVIS_BUILD_NUMBER -v `pwd`:/data/ acemod/armake /bin/bash -c "cd /data/.tf47Tools; pip install PyYAML; python3 build.py";
fi
script:
- if [ -n "${GH_TOKEN}" ] && [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
git fetch -t;
git fetch -t;
python3 .tf47Tools/deploy.py;
fi

0 comments on commit 469d5b1

Please sign in to comment.