Skip to content

Commit

Permalink
Attempt to make Travis go green
Browse files Browse the repository at this point in the history
  • Loading branch information
abarth committed Jul 17, 2015
1 parent 9b304bb commit 86e968f
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ before_script:
- ./travis/setup.sh
- export PATH=$PWD/depot_tools:$PATH
- export BOTO_CONFIG=$PWD/boto
- cd src
script: ./travis/build.sh
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ target.
### Android

* (Only the first time) `./build/install-build-deps-android.sh`
* (Only the first time) `./tools/android/download_android_tools.py`
* `./sky/tools/gn --android`
* `ninja -C out/android_Debug`
* `./sky/tools/shelldb start out/android_Debug/ sky/sdk/example/hello_world/lib/main.dart`
Expand Down
6 changes: 0 additions & 6 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,6 @@ hooks = [
'pattern': '.',
'action': ['python', 'src/tools/dart/update.py'],
},
{
# This downloads android_tools according to tools/android/VERSION_*.
'name': 'android_tools',
'pattern': '.',
'action': ['python', 'src/tools/android/download_android_tools.py'],
},
{
# This downloads SDK extras and puts them in the
# third_party/android_tools/sdk/extras directory on the bots. Developers
Expand Down
2 changes: 1 addition & 1 deletion build/config/crypto.gni
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ use_openssl_certs = is_android
# True if NSS is used for certificate verification. Note that this is
# independent from use_openssl. It is possible to use OpenSSL for the crypto
# library, but NSS for the platform certificate library.
use_nss_certs = is_linux
use_nss_certs = false
2 changes: 1 addition & 1 deletion travis/gclient
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ solutions = [{
"managed" : False,
"safesync_url": "",
}]
target_os = ['android', 'linux']
target_os = ['linux']
23 changes: 16 additions & 7 deletions travis/setup.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
#!/bin/bash
set -ex

# Create an src/ directory to work with.
# TODO(alhaad): This is a temporary hack. Find a better way to do this.
mkdir ../src
mv * ../src
mv .??* ../src
mv ../src .

# Get depot_tools.
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
export PATH="$(pwd)/depot_tools:${PATH}"

# Get dependencies.
sudo apt-get install libdbus-1-dev libgconf2-dev bison gperf wdiff python-openssl
sudo easy_install pip
sudo pip install requests

# Get gsutil
rm -f gsutil.tar.gz
wget https://storage.googleapis.com/pub/gsutil.tar.gz
tar xzf gsutil.tar.gz

# Get dependencies.
sudo apt-get install libdbus-1-dev
sudo apt-get install libgconf2-dev
sudo apt-get install python-openssl
sudo easy_install pip
sudo pip install requests
# Setup .gclient file.
cp src/travis/gclient .gclient

gclient sync --gclientfile=travis/gclient
cd src
gclient sync

0 comments on commit 86e968f

Please sign in to comment.