Browse Source

Merge branch 'hl' of github.com:HaxeFoundation/haxe into hl

Nicolas Cannasse 9 years ago
parent
commit
5a7dd309d5
2 changed files with 4 additions and 65 deletions
  1. 1 65
      .travis.yml
  2. 3 0
      tests/RunCi.hx

+ 1 - 65
.travis.yml

@@ -37,71 +37,7 @@ matrix:
     # linux #
     #########
     - os: linux
-      env: TEST=third-party
-      language: php
-      php: 5.4
-      addons: {apt: {packages: [*apt_cpp, *apt_cs, *apt_python]}}
-    - os: linux
-      env: TEST=macro
-      addons: {apt: {packages: [*apt_cs, *apt_python]}}
-    - os: linux
-      env:
-        - TEST=neko
-        - BINTRAY=1
-    - os: linux
-      env:
-        - TEST=js
-        - SAUCE=1
-      addons: {apt: {packages: *apt_common}, sauce_connect: true}
-    - os: linux
-      env: TEST=php
-      language: php
-      php: 5.4
-    - os: linux
-      env: TEST=cpp
-      addons: {apt: {packages: *apt_cpp}}
-    - os: linux
-      env: TEST=flash9
-      addons: {apt: {packages: *apt_flash}}
-    - os: linux
-      env: TEST=as3
-      addons: {apt: {packages: *apt_flash}}
-    - os: linux
-      env: TEST=java
-    - os: linux
-      env: TEST=cs
-      addons: {apt: {packages: *apt_cs}}
-    - os: linux
-      env: TEST=python
-      addons: {apt: {packages: *apt_python}}
-
-    #######
-    # osx #
-    #######
-    - os: osx
-      env: TEST=third-party
-    - os: osx
-      env: TEST=macro
-    - os: osx
-      env:
-        - TEST=neko
-        - BINTRAY=1
-    - os: osx
-      env: TEST=js
-    - os: osx
-      env: TEST=php
-    - os: osx
-      env: TEST=cpp
-    - os: osx
-      env: TEST=flash9
-    - os: osx
-      env: TEST=as3
-    - os: osx
-      env: TEST=java
-    - os: osx
-      env: TEST=cs
-    - os: osx
-      env: TEST=python
+      env: TEST=hl
 
 install:
   # Install haxe and neko dependencies

+ 3 - 0
tests/RunCi.hx

@@ -26,6 +26,7 @@ private typedef TravisConfig = {
 	var Java = "java";
 	var Cs = "cs";
 	var Python = "python";
+	var Hl = "hl";
 	var ThirdParty = "third-party";
 }
 
@@ -1035,6 +1036,8 @@ class RunCi {
 					var success = runFlash("bin/unit9_as3.swf");
 					if (!success)
 						Sys.exit(1);
+				case Hl:
+					runCommand("haxe", ["compile-hl.hxml"]);
 				case ThirdParty:
 					getPhpDependencies();
 					getJavaDependencies();