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

Commit 469d5b1

Browse files
committed
TravisCI fix
Travis CI fix pt2
1 parent 72c0e3f commit 469d5b1

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.tf47Tools/build.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ def createmapvariants():
4444
def replaceTemplates():
4545
path = 'builds'
4646
files = ['mission.sqm', 'description.ext', 'x_client/x_intro.sqf']
47-
cfg['Templates']['VERSION'] = label;
4847
for island in os.listdir(path):
4948
if os.path.isdir(os.path.join(os.path.abspath(path), island)):
50-
cfg['Templates']['ISLAND'] = os.path.splitext(island)[1].strip('.').upper()
49+
curIsland =os.path.splitext(island)[1].strip('.').upper()
5150
for file in files:
5251
for template in cfg['Templates']:
5352
filePath= "{}/{}/{}".format(path,island, file)
5453
inplace_change(filePath, template, cfg['Templates'][template])
54+
inplace_change(filePath, "VERSION", label)
55+
inplace_change(filePath, "ISLAND", curIsland)
56+
5557

5658

5759
def inplace_change(filename, old_string, new_string):

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ before_install:
1010
pip install github3.py;
1111
pip install PyYAML;
1212
docker pull acemod/armake;
13-
docker run -v `pwd`:/data/ acemod/armake /bin/bash -c "cd /data/.tf47Tools; pip install PyYAML; python3 build.py";
13+
docker run -e TRAVIS_BUILD_NUMBER -v `pwd`:/data/ acemod/armake /bin/bash -c "cd /data/.tf47Tools; pip install PyYAML; python3 build.py";
1414
fi
1515
script:
1616
- if [ -n "${GH_TOKEN}" ] && [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
17-
git fetch -t;
17+
git fetch -t;
1818
python3 .tf47Tools/deploy.py;
1919
fi
20-

0 commit comments

Comments
 (0)