Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 673ffbc

Browse files
committed
Attempt to make Travis go green
1 parent 9b304bb commit 673ffbc

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ before_script:
66
- ./travis/setup.sh
77
- export PATH=$PWD/depot_tools:$PATH
88
- export BOTO_CONFIG=$PWD/boto
9+
- cd src
910
script: ./travis/build.sh

DEPS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ hooks = [
187187
{
188188
# This downloads android_tools according to tools/android/VERSION_*.
189189
'name': 'android_tools',
190-
'pattern': '.',
190+
# This pattern limits this hook to working copies that are trying to build for android.
191+
'pattern': 'third_party/freetype-android/src',
191192
'action': ['python', 'src/tools/android/download_android_tools.py'],
192193
},
193194
{

build/config/crypto.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ use_openssl_certs = is_android
2626
# True if NSS is used for certificate verification. Note that this is
2727
# independent from use_openssl. It is possible to use OpenSSL for the crypto
2828
# library, but NSS for the platform certificate library.
29-
use_nss_certs = is_linux
29+
use_nss_certs = false

travis/gclient

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ solutions = [{
55
"managed" : False,
66
"safesync_url": "",
77
}]
8-
target_os = ['android', 'linux']
8+
target_os = ['linux']

travis/setup.sh

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
#!/bin/bash
22
set -ex
33

4+
# Create an src/ directory to work with.
5+
# TODO(alhaad): This is a temporary hack. Find a better way to do this.
6+
mkdir ../src
7+
mv * ../src
8+
mv .??* ../src
9+
mv ../src .
10+
411
# Get depot_tools.
512
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
613
export PATH="$(pwd)/depot_tools:${PATH}"
714

15+
# Get dependencies.
16+
sudo apt-get install libdbus-1-dev libgconf2-dev bison gperf wdiff python-openssl
17+
sudo easy_install pip
18+
sudo pip install requests
19+
820
# Get gsutil
921
rm -f gsutil.tar.gz
1022
wget https://storage.googleapis.com/pub/gsutil.tar.gz
1123
tar xzf gsutil.tar.gz
1224

13-
# Get dependencies.
14-
sudo apt-get install libdbus-1-dev
15-
sudo apt-get install libgconf2-dev
16-
sudo apt-get install python-openssl
17-
sudo easy_install pip
18-
sudo pip install requests
25+
# Setup .gclient file.
26+
cp src/travis/gclient .gclient
1927

20-
gclient sync --gclientfile=travis/gclient
28+
cd src
29+
gclient sync

0 commit comments

Comments
 (0)