Skip to content

update filter example with what we use for tests#7737

Merged
lizan merged 3 commits intoenvoyproxy:masterfrom
Mythra:use-workspace-filter
Jul 26, 2019
Merged

update filter example with what we use for tests#7737
lizan merged 3 commits intoenvoyproxy:masterfrom
Mythra:use-workspace-filter

Conversation

@Mythra
Copy link
Copy Markdown
Member

@Mythra Mythra commented Jul 26, 2019

Description:

this forces the same workspace file we use for tests:

to be pushed to the envoy-filter-example. this will allow not having
to file a manual PR to fix the build, such as:

Risk Level: Low
Testing: Not sure how I can test this manually. Perhaps someone as part of the envoy org can run the script manually?
Docs Changes: None
Release Notes: None

update filter example with what we use for tests
5dc607e 
this forces the same workspace file we use for tests:
  - https://github.com/envoyproxy/envoy/blob/14c5371/ci/build_setup.sh#L75

to be pushed to the envoy-filter-example. this will allow not having
to file a manual PR to fix the build, such as:

- envoyproxy/envoy-filter-example#95

Signed-off-by: Cynthia Coan <ccoan@instructure.com>
@Mythra Mythra force-pushed the use-workspace-filter branch from 5c64272 to 5dc607e Compare July 26, 2019 20:08
@Mythra Mythra mentioned this pull request Jul 26, 2019
Closed
fix spelling of committing
780d462 
Signed-off-by: Cynthia Coan <ccoan@instructure.com>
lizan
lizan reviewed Jul 26, 2019
View reviewed changes
envoy-filter-example uses submodules
f7b67f3 
Signed-off-by: Cynthia Coan <ccoan@instructure.com>
@lizan
Copy link
Copy Markdown
Member

lizan commented Jul 26, 2019

You may run this locally by setting CIRCLE_BRANCH=master, though it should fail at pushing but you can see the repo.

@Mythra
Copy link
Copy Markdown
Member Author

Mythra commented Jul 26, 2019

I had to comment the line the line: git -C "$CHECKOUT_DIR/envoy" checkout "$ENVOY_SHA" because it couldn't find the SHA for my uncommited branch which makes sense.

However after commenting that out I was able to get to the failed push. Which properly created a commit:

commit ec73b5f621965c7e78e8a5df515b772f33ae2a20 (HEAD -> master)
Author: envoy-filter-example(CircleCI) <envoy-filter-example@users.noreply.github.com>
Date:   Fri Jul 26 14:24:57 2019 -0600

    Update Envoy submodule to f7b67f33009838e56484da7d667aacc13e8218a4

With a proper workspace:

workspace(name = "envoy_filter_example")

local_repository(
    name = "envoy",
    path = "envoy",
)

load("@envoy//bazel:api_binding.bzl", "envoy_api_binding")

envoy_api_binding()

load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")

envoy_api_dependencies()

load("@envoy//bazel:repositories.bzl", "envoy_dependencies")

envoy_dependencies()

load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")

envoy_dependency_imports()

That can build envoy

lizan
lizan approved these changes Jul 26, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@lizan lizan left a comment

Choose a reason for hiding this comment

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

Cool, thanks!

@lizan lizan merged commit 50df654 into envoyproxy:master Jul 26, 2019
@lizan
Copy link
Copy Markdown
Member

lizan commented Jul 26, 2019

Looks like it works:

https://circleci.com/gh/envoyproxy/envoy/256692
envoyproxy/envoy-filter-example@ff9aa85

@Mythra
Copy link
Copy Markdown
Member Author

Mythra commented Jul 26, 2019

Phew. Always glad to see something work I can’t test all the way through.

Hopefully this will keep filter working.

Thanks for the quick review!

@Mythra Mythra deleted the use-workspace-filter branch July 26, 2019 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@lizan lizan lizan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@lizan lizan

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Mythra @lizan