Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ executors:
ubuntu-build:
description: "A regular build executor based on ubuntu image"
docker:
- image: envoyproxy/envoy-build:111781fa2823535762e9c514db0c5c41a119b4b1
- image: envoyproxy/envoy-build:698009170e362f9ca0594f2b1927fbbee199bf98
resource_class: xlarge
working_directory: /source

Expand Down Expand Up @@ -127,6 +127,7 @@ jobs:
- run: ci/do_circle_ci.sh check_format
- run: ci/do_circle_ci.sh check_repositories
- run: ci/do_circle_ci.sh check_spelling
- run: ci/do_circle_ci.sh check_spelling_pedantic
build_image:
docker:
- image: circleci/python:3.7
Expand Down
7 changes: 6 additions & 1 deletion ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
build_setup_args=""
if [[ "$1" == "fix_format" || "$1" == "check_format" || "$1" == "check_repositories" || \
"$1" == "check_spelling" || "$1" == "fix_spelling" || "$1" == "bazel.clang_tidy" || \
"$1" == "check_spelling_pedantic" ]]; then
"$1" == "check_spelling_pedantic" || "$1" == "fix_spelling_pedantic" ]]; then
build_setup_args="-nofetch"
fi

Expand Down Expand Up @@ -305,6 +305,11 @@ elif [[ "$1" == "check_spelling_pedantic" ]]; then
echo "check_spelling_pedantic..."
./tools/check_spelling_pedantic.py check
exit 0
elif [[ "$1" == "fix_spelling_pedantic" ]]; then
cd "${ENVOY_SRCDIR}"
echo "fix_spelling_pedantic..."
./tools/check_spelling_pedantic.py fix
exit 0
elif [[ "$1" == "docs" ]]; then
echo "generating docs..."
docs/build.sh
Expand Down
4 changes: 2 additions & 2 deletions include/envoy/stats/symbol_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class SymbolTable {
* with a corrupt stats set.
*
* @param stat_name the stat name.
* @return std::string stringifiied stat_name.
* @return std::string stringified stat_name.
*/
virtual std::string toString(const StatName& stat_name) const PURE;

Expand Down Expand Up @@ -122,7 +122,7 @@ class SymbolTable {
*
* This is intended for use doing cached name lookups of scoped stats, where
* the scope prefix and the names to combine it with are already in StatName
* form. Using this class, they can be combined without acessingm the
* form. Using this class, they can be combined without accessing the
* SymbolTable or, in particular, taking its lock.
*
* @param stat_names the names to join.
Expand Down
4 changes: 2 additions & 2 deletions test/common/network/udp_listener_impl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ TEST_P(ListenerImplTest, UdpEcho) {
getSocketAddressInfo(*client_socket.get(), server_ip->port(), server_addr, addr_len);
ASSERT_GT(addr_len, 0);

// We send 2 packets and exptect it to echo.
// We send 2 packets and expect it to echo.
const std::string first("first");
const std::string second("second");

Expand Down Expand Up @@ -456,7 +456,7 @@ TEST_P(ListenerImplTest, UdpListenerEnableDisable) {
}

/**
* Tests UDP listebe's error callback.
* Tests UDP listener's error callback.
*/
TEST_P(ListenerImplTest, UdpListenerRecvFromError) {
// Setup server socket
Expand Down
2 changes: 1 addition & 1 deletion tools/check_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

EXCLUDED_PREFIXES = ("./generated/", "./thirdparty/", "./build", "./.git/", "./bazel-", "./.cache",
"./source/extensions/extensions_build_config.bzl",
"./tools/testdata/check_format/")
"./tools/testdata/check_format/", "./tools/pyformat/")
SUFFIXES = (".cc", ".h", "BUILD", "WORKSPACE", ".bzl", ".md", ".rst", ".proto")
DOCS_SUFFIX = (".md", ".rst")
PROTO_SUFFIX = (".proto")
Expand Down
Loading