Browse Source

_s, php 5.5., upstream

windhamdavid 10 years ago
parent
commit
78d08c5efb
3 changed files with 30 additions and 3 deletions
  1. 28 1
      .travis.yml
  2. 1 1
      app/themes/_s
  3. 1 1
      wp

+ 28 - 1
.travis.yml

@@ -5,6 +5,30 @@ php:
     - "5.3"
     - "5.4"
     - "5.5"
+env:
+    - WP_VERSION=master WP_MULTISITE=0
+    - WP_VERSION=master WP_MULTISITE=1
+
+matrix:
+  include:
+    - php: 5.5
+      env: WP_TRAVISCI=travis:js
+    - php: 5.2
+      env: WP_TRAVISCI=travis:phpunit
+    - php: 5.3
+      env: WP_TRAVISCI=travis:phpunit
+    - php: 5.4
+      env: WP_TRAVISCI=travis:phpunit
+    - php: 5.5
+      env: WP_TRAVISCI=travis:phpunit
+    - php: 5.6
+      env: WP_TRAVISCI=travis:phpunit
+    - php: hhvm
+      env: WP_TRAVISCI=travis:phpunit
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+	
 
 branches:
   except:
@@ -15,4 +39,7 @@ before_script:
   - npm install
 
   
-script: grunt
+script: grunt $WP_TRAVISCI
+
+notifications:
+    email: false

+ 1 - 1
app/themes/_s

@@ -1 +1 @@
-Subproject commit e68c231ed1b8118744727bb156a97619359157d2
+Subproject commit 85247e79961e28d54c53cc553335bf71c0272df8

+ 1 - 1
wp

@@ -1 +1 @@
-Subproject commit f30266acb9ff9ef30dfe14ae64ef165039980835
+Subproject commit bf52618636796d1f1dcc16fb218b9e244832e879