Skip to content

Fix mobile/tools/check_format.sh to re-apply #2698#24300

Merged
RyanTheOptimist merged 2 commits intoenvoyproxy:mainfrom
RyanTheOptimist:check_format
Dec 2, 2022
Merged

Fix mobile/tools/check_format.sh to re-apply #2698#24300
RyanTheOptimist merged 2 commits intoenvoyproxy:mainfrom
RyanTheOptimist:check_format

Conversation

@RyanTheOptimist
Copy link
Copy Markdown
Contributor

@RyanTheOptimist RyanTheOptimist commented Dec 1, 2022

Fix mobile/tools/check_format.sh to re-apply #2698 which got lost in a merge conflict.

Signed-off-by: Ryan Hamilton rch@google.com

Risk Level: None
Testing: Manual
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

@RyanTheOptimist
Fix mobile/tools/check_format.sh to re-apply envoyproxy#2698
eb9713a 
Signed-off-by: Ryan Hamilton <rch@google.com>
@repokitteh-read-only
Copy link
Copy Markdown

repokitteh-read-only bot commented Dec 1, 2022

CC @envoyproxy/mobile-maintainers: FYI only for changes made to (mobile/).
envoyproxy/mobile-maintainers assignee is @jpsim

🐱

Caused by: #24300 was opened by RyanTheOptimist.

see: more, trace.

@RyanTheOptimist
Copy link
Copy Markdown
Contributor Author

RyanTheOptimist commented Dec 1, 2022

/assign @jpsim

@RyanTheOptimist
Copy link
Copy Markdown
Contributor Author

RyanTheOptimist commented Dec 1, 2022

It's a bit hard to see, but the real diff is:

git diff 4a41a175099f52ba1b2046a2dac9ba04c41b2865 tools/check_format.sh
diff --git a/mobile/tools/check_format.sh b/mobile/tools/check_format.sh
index c42656c6b7..d2a12d715c 100755
--- a/mobile/tools/check_format.sh
+++ b/mobile/tools/check_format.sh
@@ -24,7 +24,7 @@ TARGET_PATH="$2"
 #                     or in the upstream checker.
 
 FORMAT_ARGS=(
-    --config_path envoy/tools/code_format/config.yaml
+    --config_path ../tools/code_format/config.yaml
     --add-excluded-prefixes
     ./envoy/ ./envoy_build_config/extensions_build_config.bzl ./WORKSPACE
     ./Envoy.xcodeproj/ ./dist/ ./library/common/config_template.cc
@@ -47,4 +47,4 @@ FORMAT_ARGS+=(
     ./library/common/extensions ./test/java ./test/kotlin ./test/objective-c
     ./test/swift ./experimental/swift)
 
-ENVOY_BAZEL_PREFIX=@envoy envoy/tools/code_format/check_format.py "${FORMAT_ARGS[@]}"
+ENVOY_BAZEL_PREFIX=@envoy ../tools/code_format/check_format.py "${FORMAT_ARGS[@]}"

jpsim
jpsim approved these changes Dec 1, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@jpsim jpsim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work for me locally:

$ ./tools/check_format.sh 
No action specified, defaulting to check
Please note: `tools/code_format/check_format.py` no longer checks API `.proto` files, please use `tools/proto_format/proto_format.sh` if you are making changes to the API files
PASS

@RyanTheOptimist
Merge branch 'main' into check_format
1f90c47 
Signed-off-by: Ryan Hamilton <rch@google.com>
@RyanTheOptimist RyanTheOptimist merged commit 80f347b into envoyproxy:main Dec 2, 2022
jpsim added a commit to alyssawilk/envoy that referenced this pull request Dec 2, 2022
@jpsim
Merge remote-tracking branch 'origin/main' into uuid
0fe0a64 
* origin/main:
  Start slow start window on first successful HC, make slow start re-enterable (envoyproxy#23946)
  contrib-sipproxy: rework sipproxy stats (envoyproxy#24165)
  build(deps): bump github/codeql-action from 2.1.32 to 2.1.35 (envoyproxy#24292)
  build(deps): bump node from `c59fb39` to `80844b6` in /examples/ext_authz/auth/http-service (envoyproxy#24274)
  build(deps): bump actions/upload-artifact from 2 to 3 (envoyproxy#24121)
  build(deps): bump mysql from `96439dd` to `66efaaa` in /examples/mysql (envoyproxy#24273)
  build(deps): bump grpcio from 1.50.0 to 1.51.1 in /examples/grpc-bridge/client (envoyproxy#24272)
  Allow mobile/library/common/jni/ to be built on non-Android platforms. (envoyproxy#24299)
  generic proxy: added drain support to generic proxy to doing graceful closes on connections when possible (envoyproxy#24220)
  Reduce Route/VirtualHost memory utilization by avoiding RateLimitPolicy instances when not needed (envoyproxy#24243)
  Reduce VirtualHost memory utilization by avoiding CatchAllVirtualCluster when not needed (envoyproxy#24182)
  Fix mobile/tools/check_format.sh to re-apply envoyproxy#2698 (envoyproxy#24300)
  upstream: don't require `source_address` in `upstream_bind_config` (envoyproxy#24250)
  Quiche roll 20221201150327 (envoyproxy#24290)

Signed-off-by: JP Simard <jp@jpsim.com>
jpsim added a commit that referenced this pull request Dec 2, 2022
@jpsim
Merge remote-tracking branch 'origin/main' into dependabot/pip/mobile…
5cb6906 
…/docs/sphinx-5.3.0

* origin/main: (50 commits)
  ci: Bump mobile build images (#24317)
  ci: update llvm on bazel CI (#24296)
  ci: Fix flaky coverage limit (#24320)
  ci: Fix change detection (part 2) (#24264)
  Start slow start window on first successful HC, make slow start re-enterable (#23946)
  contrib-sipproxy: rework sipproxy stats (#24165)
  build(deps): bump github/codeql-action from 2.1.32 to 2.1.35 (#24292)
  build(deps): bump node from `c59fb39` to `80844b6` in /examples/ext_authz/auth/http-service (#24274)
  build(deps): bump actions/upload-artifact from 2 to 3 (#24121)
  build(deps): bump mysql from `96439dd` to `66efaaa` in /examples/mysql (#24273)
  build(deps): bump grpcio from 1.50.0 to 1.51.1 in /examples/grpc-bridge/client (#24272)
  Allow mobile/library/common/jni/ to be built on non-Android platforms. (#24299)
  generic proxy: added drain support to generic proxy to doing graceful closes on connections when possible (#24220)
  Reduce Route/VirtualHost memory utilization by avoiding RateLimitPolicy instances when not needed (#24243)
  Reduce VirtualHost memory utilization by avoiding CatchAllVirtualCluster when not needed (#24182)
  Fix mobile/tools/check_format.sh to re-apply #2698 (#24300)
  upstream: don't require `source_address` in `upstream_bind_config` (#24250)
  Quiche roll 20221201150327 (#24290)
  Cleanup threading/ownership semantics of PlatformBridgeCertValidator (#2713)
  Add unit tests of the PlatformBridgeCertValidator (#2704)
  ...

Signed-off-by: JP Simard <jp@jpsim.com>
jpsim added a commit that referenced this pull request Dec 2, 2022
@jpsim
Merge remote-tracking branch 'origin/main' into dependabot/pip/mobile…
a923192 
…/docs/pygments-2.13.0

* origin/main: (25 commits)
  ci: Bump mobile build images (#24317)
  ci: update llvm on bazel CI (#24296)
  ci: Fix flaky coverage limit (#24320)
  ci: Fix change detection (part 2) (#24264)
  Start slow start window on first successful HC, make slow start re-enterable (#23946)
  contrib-sipproxy: rework sipproxy stats (#24165)
  build(deps): bump github/codeql-action from 2.1.32 to 2.1.35 (#24292)
  build(deps): bump node from `c59fb39` to `80844b6` in /examples/ext_authz/auth/http-service (#24274)
  build(deps): bump actions/upload-artifact from 2 to 3 (#24121)
  build(deps): bump mysql from `96439dd` to `66efaaa` in /examples/mysql (#24273)
  build(deps): bump grpcio from 1.50.0 to 1.51.1 in /examples/grpc-bridge/client (#24272)
  Allow mobile/library/common/jni/ to be built on non-Android platforms. (#24299)
  generic proxy: added drain support to generic proxy to doing graceful closes on connections when possible (#24220)
  Reduce Route/VirtualHost memory utilization by avoiding RateLimitPolicy instances when not needed (#24243)
  Reduce VirtualHost memory utilization by avoiding CatchAllVirtualCluster when not needed (#24182)
  Fix mobile/tools/check_format.sh to re-apply #2698 (#24300)
  upstream: don't require `source_address` in `upstream_bind_config` (#24250)
  Quiche roll 20221201150327 (#24290)
  Cleanup threading/ownership semantics of PlatformBridgeCertValidator (#2713)
  Add unit tests of the PlatformBridgeCertValidator (#2704)
  ...

Signed-off-by: JP Simard <jp@jpsim.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Augustyniak Augustyniak Awaiting requested review from Augustyniak

@alyssawilk alyssawilk Awaiting requested review from alyssawilk

@abeyad abeyad Awaiting requested review from abeyad abeyad is a code owner

1 more reviewer

@jpsim jpsim jpsim approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jpsim jpsim

Labels

mobile

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@RyanTheOptimist @jpsim