From 33447a5c7124ac9df726b8fe8332c857b0695454 Mon Sep 17 00:00:00 2001 From: Snow Pettersen Date: Mon, 22 Oct 2018 14:02:40 -0700 Subject: [PATCH] ci/docs: update references to travis to CircleCI (#4818) Signed-off-by: Snow Pettersen --- DEVELOPER.md | 2 +- STYLE.md | 2 +- ci/README.md | 2 +- ci/build_container/docker_push.sh | 2 +- ci/coverage_publish.sh | 2 +- ci/docker_push.sh | 4 ++-- ci/docker_tag.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index 6050a4095f6f..ee76c5746310 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -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). diff --git a/STYLE.md b/STYLE.md index 62bb91fc0956..cec017d254ae 100644 --- a/STYLE.md +++ b/STYLE.md @@ -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 diff --git a/ci/README.md b/ci/README.md index 8d402f8dd235..f8f6787ce67a 100644 --- a/ci/README.md +++ b/ci/README.md @@ -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:`](https://hub.docker.com/r/envoyproxy/envoy-build/) is used for Travis CI checks, +The Ubuntu based Envoy Docker image at [`envoyproxy/envoy-build:`](https://hub.docker.com/r/envoyproxy/envoy-build/) is used for CircleCI checks, where `` 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 diff --git a/ci/build_container/docker_push.sh b/ci/build_container/docker_push.sh index df888642dc84..72523f5ffe7b 100755 --- a/ci/build_container/docker_push.sh +++ b/ci/build_container/docker_push.sh @@ -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 diff --git a/ci/coverage_publish.sh b/ci/coverage_publish.sh index 45bc71bfa503..a1e08fbc4e95 100755 --- a/ci/coverage_publish.sh +++ b/ci/coverage_publish.sh @@ -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 diff --git a/ci/docker_push.sh b/ci/docker_push.sh index 6973da297a9a..8f27a60b0622 100755 --- a/ci/docker_push.sh +++ b/ci/docker_push.sh @@ -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 @@ -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 diff --git a/ci/docker_tag.sh b/ci/docker_tag.sh index a30ce985bb3c..8e64dd418c75 100755 --- a/ci/docker_tag.sh +++ b/ci/docker_tag.sh @@ -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" ]