Skip to content

Commit

Permalink
Merge pull request #199 from Gama11/fixHaxeDev
Browse files Browse the repository at this point in the history
Travis: fix builds with Haxe dev
  • Loading branch information
Gama11 committed Mar 17, 2016
2 parents 574f741 + 0dd779a commit 232dc5f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ language: haxe
haxe:
- "3.2.1"
- development
intall:
install:
- haxelib install haxeparser 3.2.0
- haxelib install compiletime 2.6.0
- haxelib install hxargs 3.0.0
- haxelib git hxargs https://github.com/Simn/hxargs
- haxelib install mcover 2.1.1
hxml:
- build.hxml
script:
- haxe build.hxml

after_success:
- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
Expand Down
4 changes: 2 additions & 2 deletions Checkstyle.hxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project version="2">
<!-- Output SWF options -->
<output>
<movie outputType="Application" />
<movie outputType="CustomBuild" />
<movie input="" />
<movie path="build.hxml" />
<movie fps="0" />
Expand Down Expand Up @@ -31,7 +31,7 @@
<haxelib>
<library name="haxeparser:3.2.0" />
<library name="compiletime:2.6.0" />
<library name="hxargs:3.0.0" />
<library name="hxargs" />
</haxelib>
<!-- Class files to compile (other referenced classes will automatically be included) -->
<compileTargets>
Expand Down
2 changes: 1 addition & 1 deletion build.hxml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-cp test
-lib haxeparser:3.2.0
-lib compiletime:2.6.0
-lib hxargs:3.0.0
-lib hxargs

--each

Expand Down
8 changes: 0 additions & 8 deletions buildTelemetry.hxml
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
-cmd haxelib newrepo
-cmd haxelib install haxeparser 3.2.0 || true
-cmd haxelib install compiletime 2.6.0 || true
-cmd haxelib install hxargs 3.0.0 || true
-cmd haxelib install hxtelemetry 0.3.3 || true

--next

-cp resources
-cp src
-lib haxeparser
Expand Down

0 comments on commit 232dc5f

Please sign in to comment.