Skip to content

Commit

Permalink
fbshipit-source-id: 20466019bc0949aeda8f4ce83e6c1dfaf7591131
Browse files Browse the repository at this point in the history
  • Loading branch information
bonniexu committed Aug 13, 2019
1 parent 7808a14 commit 5bcd054
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 10 deletions.
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

44 changes: 36 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
sudo: required
# Facebook projects that use `fbcode_builder` for continuous integration
# share this Travis configuration to run builds via Docker.

services:
- docker
# Docker disables IPv6 in containers by default. Enable it for unit tests that need [::1].
before_script:
- if [[ "$TRAVIS_OS_NAME" != "osx" ]];
then
sudo build/fbcode_builder/docker_enable_ipv6.sh;
fi

before_install:
- docker pull ubuntu:18.04
env:
global:
- travis_cache_dir=$HOME/travis_ccache
# Travis times out after 50 minutes. Very generously leave 10 minutes
# for setup (e.g. cache download, compression, and upload), so we never
# fail to cache the progress we made.
- docker_build_timeout=40m

cache:
# Our build caches can be 200-300MB, so increase the timeout to 7 minutes
# to make sure we never fail to cache the progress we made.
timeout: 420
directories:
- $HOME/travis_ccache # see docker_build_with_ccache.sh

# Ugh, `services:` must be in the matrix, or we get `docker: command not found`
# https://github.com/travis-ci/travis-ci/issues/5142
matrix:
include:
- env: ['os_image=ubuntu:18.04', gcc_version=7]
services: [docker]

addons:
apt:
packages: python2.7

script:
- docker run --rm -v $PWD:/katran ubuntu:18.04 /bin/sh -c "
apt-get update && apt-get install -y git sudo wget;
cd /katran && ./build_katran.sh"
# We don't want to write the script inline because of Travis kludginess --
# it looks like it escapes " and \ in scripts when using `matrix:`.
- ./build/fbcode_builder/travis_docker_build.sh
2 changes: 1 addition & 1 deletion example_grpc/goclient/src/katranc/main/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var (
listQuicMapping = flag.Bool("list_qm", false, "List current quic's mappings")
delQuicMapping = flag.Bool("del_qm", false,
"Delete instead of adding specified quic mapping")
katranServer = flag.String("server", "127.0.0.1:50051",
katranServer = flag.String("server", "127.0.0.1:50051",
"Katran server listen address")
)

Expand Down

0 comments on commit 5bcd054

Please sign in to comment.