Skip to content

Commit

Permalink
Merge pull request #155 from ConfettiFX/confetti-dev
Browse files Browse the repository at this point in the history
CI-Update
  • Loading branch information
AntoineConffx authored Nov 15, 2019
2 parents c908080 + 6314bde commit e46757c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ language: objective-c
python:
- 3.6
script:
- travis_wait 40 python PyBuild.py --skipioscodesigning --forceprebuild --skipreleasebuild
- travis_wait 40 python CI/PyBuild.py --skipioscodesigning --forceprebuild --skipreleasebuild --preserveworkingdir
6 changes: 4 additions & 2 deletions PyBuild.py → CI/PyBuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -1408,6 +1408,7 @@ def MainLogic():
parser.add_argument('--skipaura', action="store_true", help='If enabled, will skip building aura.')
parser.add_argument('--skipdx11', action="store_true", help='If enabled, will skip building DX11.')
parser.add_argument('--xcodederiveddatapath', type=str, default='Null', help = 'Uses a specific path relative to root of project for derived data. If null then it uses the default location for derived data')
parser.add_argument('--preserveworkingdir', action="store_true", help='If enabled, will keep working directory as is instead of changing it to path of PyBuild.')
#TODO: remove the test in parse_args
arguments = parser.parse_args()

Expand All @@ -1423,8 +1424,9 @@ def MainLogic():
signal.signal(signal.SIGINT, CleanupHandler)

#change path to scripts location
print (sys.path[0])
os.chdir(sys.path[0])
if not arguments.preserveworkingdir:
os.chdir(sys.path[0])

returnCode = 0

if (arguments.xbox is not True and arguments.xboxonly is not True) or "XboxOneXDKLatest" not in os.environ:
Expand Down

0 comments on commit e46757c

Please sign in to comment.