Browse Source

sync with dev

Nicolas Cannasse 9 years ago
parent
commit
bfd677c24b
3 changed files with 91 additions and 10 deletions
  1. 89 8
      .travis.yml
  2. 1 1
      extra/haxelib_src
  3. 1 1
      libs

+ 89 - 8
.travis.yml

@@ -15,9 +15,14 @@ env:
     - secure: "VBJDQNJ9uvdt0aszo7oU3txuRvjkuLmuHZGOkrd4wE/5B4sX5jzx/+dnrKcNTXJCmQ/rVLuMu9GyxqVjNHlzce678voxdQNOtNkNgpkr1qN9/A9rRnCp77hH27ErdthpWxbmcnE62hAJ83TIKSvn//5lAkx4sMCKS1NXEWQ5qec="
     - secure: "VBJDQNJ9uvdt0aszo7oU3txuRvjkuLmuHZGOkrd4wE/5B4sX5jzx/+dnrKcNTXJCmQ/rVLuMu9GyxqVjNHlzce678voxdQNOtNkNgpkr1qN9/A9rRnCp77hH27ErdthpWxbmcnE62hAJ83TIKSvn//5lAkx4sMCKS1NXEWQ5qec="
     # HAXECI_GH_TOKEN: haxe-ci Github personal access token
     # HAXECI_GH_TOKEN: haxe-ci Github personal access token
     - secure: "TpEMYTLgNrVD7kR6hs6EwyWNXUxnfV6XO5MGvYQncKXB1N65PG18n4WQFhnKaH8C2QTFE7dq7688ooXGzwWeoT9WAOBey10jP1f7LXEAjMGAUA4vh2zS93qBZ92ZgzCDZnQN7ZOTQGocwU6Xolu+7/6hP2M8041HBixmFuNkXF4="
     - secure: "TpEMYTLgNrVD7kR6hs6EwyWNXUxnfV6XO5MGvYQncKXB1N65PG18n4WQFhnKaH8C2QTFE7dq7688ooXGzwWeoT9WAOBey10jP1f7LXEAjMGAUA4vh2zS93qBZ92ZgzCDZnQN7ZOTQGocwU6Xolu+7/6hP2M8041HBixmFuNkXF4="
+    # PPA configs
+    - PPA="ppa:haxe/snapshots"
+    - DEBFULLNAME="Haxe CI Bot"
+    - DEBEMAIL="[email protected]"
 
 
 sudo: false
 sudo: false
 addons:
 addons:
+  ssh_known_hosts: haxe.org
   apt:
   apt:
     packages: &apt_common
     packages: &apt_common
       - ocaml-native-compilers
       - ocaml-native-compilers
@@ -29,7 +34,7 @@ apt_targets:
   - &apt_cpp    [*apt_common, gcc-multilib, g++-multilib]
   - &apt_cpp    [*apt_common, gcc-multilib, g++-multilib]
   - &apt_cs     [*apt_common, mono-devel, mono-mcs]
   - &apt_cs     [*apt_common, mono-devel, mono-mcs]
   - &apt_python [*apt_common, python3]
   - &apt_python [*apt_common, python3]
-  - &apt_flash  [*apt_common, libgd2-xpm, ia32-libs, ia32-libs-multiarch]
+  - &apt_flash  [*apt_common, "libcurl3:i386", "libglib2.0-0:i386", "libx11-6:i386", "libxext6:i386", "libxt6:i386", "libxcursor1:i386", "libnss3:i386", "libgtk2.0-0:i386"]
 
 
 matrix:
 matrix:
   include:
   include:
@@ -37,7 +42,82 @@ matrix:
     # linux #
     # linux #
     #########
     #########
     - os: linux
     - os: linux
-      env: TEST=hl
+      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
+      sudo: required
+      dist: trusty
+      env:
+        - TEST=neko
+        - DEPLOY=1
+        - BINTRAY=1
+        # haxeci_decrypt (Deploy source package to ppa:haxe/snapshots.)
+        - secure: "Mw3p6bDZuqVQ6u7GrwLQfje5hhIOA4+mdqqLXYHP79UKdhgqb91Dn6IbG9vQ1VXVe64W4YZbQAMBMMRX5kEPDl6JvTVGSBhg00Mi69oO5qrCMcBI6f9FntG72YaVvLf+PA7co+vKrnJzaP2M9pe4SH9Ztbhy0YNxULp7NQ8FLsM="
+        # deploy_key_decrypt (Deploy doc to api.haxe.org.)
+        - secure: "A75uYqU0Xz6plIgSewEs0QQWe472dCMb9kf3j7Hx0DS7dApXgx8++189sw9Sv0wam5KPtbcIM292MucjGCb5zocVj9xCUVgajhEA0QpTuDMBjk/cg3ClWCGjfybaCl2E5LLdUs7Zy4b4oNWtVikOWLWJ4sC1kaarR9p6kv8yYZg="
+      before_script:
+        - travis_retry sudo apt-get install mysql-server -y
+        - mysql -u root -e "create user travis@localhost identified by '';"
+    - 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
+        - DEPLOY=1
+        - 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
 
 
 install:
 install:
   # Install haxe and neko dependencies
   # Install haxe and neko dependencies
@@ -58,16 +138,17 @@ install:
       travis_retry brew install neko --HEAD;
       travis_retry brew install neko --HEAD;
     fi
     fi
 
 
-before_script:
+script:
+  # setup database
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-    travis_retry brew install mysql &&
-    mysql.server start;
-    mysql -u root -e "create user if not exists travis@localhost identified by '';";
+      travis_retry brew install mysql &&
+      mysql.server start;
+      mysql -u root -e "create user if not exists travis@localhost identified by '';";
     fi
     fi
   - mysql -u root -e "CREATE DATABASE haxe_test;"
   - mysql -u root -e "CREATE DATABASE haxe_test;"
   - mysql -u root -e "grant all on haxe_test.* to travis@localhost;"
   - mysql -u root -e "grant all on haxe_test.* to travis@localhost;"
-
-script:
+  # start ssh-agent for deployment to haxe.org
+  - eval `ssh-agent -s`
   - make package_src -s
   - make package_src -s
   - make -s
   - make -s
   - make tools -s
   - make tools -s

+ 1 - 1
extra/haxelib_src

@@ -1 +1 @@
-Subproject commit 80584ddf1daa3e7f2ea2bea20afe46c6a7c603ec
+Subproject commit a48fc9a385411febd1ee10e8eec770d56e4ee128

+ 1 - 1
libs

@@ -1 +1 @@
-Subproject commit 24f9f8586621dbf947403094ee185821e19b543d
+Subproject commit 4a8f47724a6f4d37a94bc3c0a21fc1800768c287