Skip to content

Commit

Permalink
ci/docs: update references to travis to CircleCI (envoyproxy#4818)
Browse files Browse the repository at this point in the history
Signed-off-by: Snow Pettersen <snowp@squareup.com>
  • Loading branch information
snowp authored and mattklein123 committed Oct 22, 2018
1 parent 7f4c6ff commit 33447a5
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion DEVELOPER.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Developer documentation

Envoy is built using the Bazel build system. Travis CI builds, tests, and runs coverage against all pull requests and the master branch.
Envoy is built using the Bazel build system. CircleCI builds, tests, and runs coverage against all pull requests and the master branch.

To get started building Envoy locally, see the [Bazel quick start](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#quick-start-bazel-build-for-developers). To run tests, there are Bazel [targets](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#testing-envoy-with-bazel) for Google Test. To generate a coverage report, use the tooling for [gcovr](https://github.com/envoyproxy/envoy/blob/master/bazel/README.md#coverage-builds).

Expand Down
2 changes: 1 addition & 1 deletion STYLE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# C++ coding style

* The Envoy source code is formatted using clang-format. Thus all white spaces, etc.
issues are taken care of automatically. The Travis tests will automatically check
issues are taken care of automatically. The CircleCI tests will automatically check
the code format and fail. There are make targets that can both check the format
(check_format) as well as fix the code format for you (fix_format).
* Beyond code formatting, for the most part Envoy uses the
Expand Down
2 changes: 1 addition & 1 deletion ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Two flavors of Envoy Docker images, based on Ubuntu and Alpine Linux, are built.

## Ubuntu envoy image
The Ubuntu based Envoy Docker image at [`envoyproxy/envoy-build:<hash>`](https://hub.docker.com/r/envoyproxy/envoy-build/) is used for Travis CI checks,
The Ubuntu based Envoy Docker image at [`envoyproxy/envoy-build:<hash>`](https://hub.docker.com/r/envoyproxy/envoy-build/) is used for CircleCI checks,
where `<hash>` is specified in [`envoy_build_sha.sh`](https://github.com/envoyproxy/envoy/blob/master/ci/envoy_build_sha.sh). Developers
may work with `envoyproxy/envoy-build:latest` to provide a self-contained environment for building Envoy binaries and
running tests that reflects the latest built Ubuntu Envoy image. Moreover, the Docker image
Expand Down
2 changes: 1 addition & 1 deletion ci/build_container/docker_push.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Do not ever set -x here, it is a security hazard as it will place the credentials below in the
# Travis logs.
# CircleCI logs.
set -e

# push the envoy image on merge to master
Expand Down
2 changes: 1 addition & 1 deletion ci/coverage_publish.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Do not ever set -x here, it is a security hazard as it will place the credentials below in the
# Travis logs.
# CircleCI logs.
set -e

if [ "${CIRCLECI}" != "true" ]; then
Expand Down
4 changes: 2 additions & 2 deletions ci/docker_push.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Do not ever set -x here, it is a security hazard as it will place the credentials below in the
# Travis logs.
# CircleCI logs.
set -e

# push the envoy image on merge to master
Expand Down Expand Up @@ -42,7 +42,7 @@ then
docker push envoyproxy/envoy-alpine-debug:latest

# This script tests the docker examples.
# TODO(mattklein123): This almost always times out on Travis. Do not run for now until we
# TODO(mattklein123): This almost always times out on CircleCI. Do not run for now until we
# have a better CI setup.
#./ci/verify_examples.sh
else
Expand Down
2 changes: 1 addition & 1 deletion ci/docker_tag.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Do not ever set -x here, it is a security hazard as it will place the credentials below in the
# Travis logs.
# CircleCI logs.
set -e

if [ -n "$CIRCLE_TAG" ]
Expand Down

0 comments on commit 33447a5

Please sign in to comment.