Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Improve Travis reliability
Previously, we were using too many parallel instances of $CXX, which caused
crashes. Now we use -j 2, which seems to work. Also, use fewer processes during
testing.
  • Loading branch information
Adam Barth committed Jul 18, 2015
commit 5cfb81a52daca6037563530e1d5da0454cf3b339
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: dart
language: cpp
sudo: required
before_install:
- ./travis/before_install.sh
Expand Down
5 changes: 4 additions & 1 deletion sky/tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def to_gn_args(args):
gn_args = {}

gn_args["is_debug"] = args.debug
gn_args["is_clang"] = args.target_os not in ['android']
gn_args["is_clang"] = args.clang and args.target_os not in ['android']

if args.target_os == 'android':
gn_args["target_os"] = "android"
Expand Down Expand Up @@ -79,6 +79,9 @@ def main():
parser.add_argument('--goma', default=True, action='store_true')
parser.add_argument('--no-goma', dest='goma', action='store_false')

parser.add_argument('--clang', default=True, action='store_true')
parser.add_argument('--no-clang', dest='clang', action='store_false')

args = parser.parse_args()

command = ['gn', 'gen', '--check']
Expand Down
4 changes: 2 additions & 2 deletions travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ set -ex

# Linux Debug
./sky/tools/gn --debug
ninja -j 8 -C out/Debug
./sky/tools/test_sky --debug
ninja -j 2 -C out/Debug
./sky/tools/test_sky --debug --child-processes=1
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 = ['linux']
target_os = ['linux', 'android']