Fix more travis file errors

Summary: and add badges to readme

Reviewed By: passy

Differential Revision: D4551571

fbshipit-source-id: c6eafe480e3667252eadc96c548c3b3c85046389
This commit is contained in:
Emil Sjolander
2017-02-13 09:27:44 -08:00
committed by Facebook Github Bot
parent ae9f89b5d1
commit abf142ea3f
2 changed files with 46 additions and 31 deletions

View File

@@ -11,11 +11,11 @@ language: cpp
compiler: clang
env:
- LANG=c
- LANG=java
- LANG=net
- LANG=ios
- LANG=js
- TARGET=c
- TARGET=java
- TARGET=net
- TARGET=ios
- TARGET=js
before_install:
- brew update
@@ -24,53 +24,62 @@ before_install:
# Java
- |
[[ $LANG = "java" ]] &&
brew cask install java &&
export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
export PATH=$JAVA_HOME/bin:$PATH
if [[ $TARGET = "java" ]]; then
brew cask install java;
export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
export PATH=$JAVA_HOME/bin:$PATH;
fi
# .NET
- |
[[ $LANG = "net" ]] &&
brew install mono
if [[ $TARGET = "net" ]]; then
brew install mono;
fi
# iOS
- |
[[ $LANG = "ios" ]] &&
brew upgrade xctool
if [[ $TARGET = "ios" ]]; then
brew upgrade xctool;
fi
# JavaScript
- |
[[ $LANG = "js" ]] &&
cd javascript &&
npm install
if [[ $TARGET = "js" ]]; then
cd javascript;
npm install;
fi
script:
# C
- |
[[ $LANG = "c" ]] &&
buck test //:yoga &&
buck run //benchmark:benchmark &&
git checkout HEAD^ &&
buck run //benchmark:benchmark
if [[ $TARGET = "c" ]]; then
buck test --verbose 0 //:yoga;
buck run --verbose 0 //benchmark:benchmark;
git checkout HEAD^;
buck run --verbose 0 //benchmark:benchmark;
fi
# Java
- |
[[ $LANG = "java" ]] &&
buck test //java:java
if [[ $TARGET = "java" ]]; then
buck test --verbose 0 //java:java;
fi
# .NET
- |
[[ $LANG = "net" ]] &&
sh csharp/tests/Facebook.Yoga/test_macos.sh
if [[ $TARGET = "net" ]]; then
sh csharp/tests/Facebook.Yoga/test_macos.sh;
fi
# iOS
- |
[[ $LANG = "ios" ]] &&
buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64
if [[ $TARGET = "ios" ]]; then
buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64;
fi
# JavaScript
- |
[[ $LANG = "js" ]] &&
npm run test:all &&
npm run bench
if [[ $TARGET = "js" ]]; then
npm run test:all;
npm run bench;
fi

View File

@@ -1,4 +1,10 @@
# Yoga [![Build Status](https://travis-ci.org/facebook/yoga.svg?branch=master)](https://travis-ci.org/facebook/yoga) [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout)
# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout)
[![C Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=c&label=C)](https://travis-ci.org/facebook/yoga)
[![Java Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=java&label=Java)](https://travis-ci.org/facebook/yoga)
[![iOS Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=ios&label=iOS)](https://travis-ci.org/facebook/yoga)
[![.NET Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=net&label=.NET)](https://travis-ci.org/facebook/yoga)
[![JavaScript Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=js&label=JavaScript)](https://travis-ci.org/facebook/yoga)
## Building
Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.