Skip to content

Repo merge clean diffs#24104

Merged
alyssawilk merged 2 commits intoenvoyproxy:mainfrom
alyssawilk:repo_merge_clean_diffs
Nov 21, 2022
Merged

Repo merge clean diffs#24104
alyssawilk merged 2 commits intoenvoyproxy:mainfrom
alyssawilk:repo_merge_clean_diffs

Conversation

@alyssawilk
Copy link
Copy Markdown
Contributor

@alyssawilk alyssawilk commented Nov 21, 2022

Full repo merge.

Push one:
copied the entire envoy mobile repo into Envoy as is from d1350ec9a42077267c7b19348f49d4da5502d191
copied EM workflows into the Envoy workflow directory

Push 2:
change mobile/envoy to a symlink to the ../ envoy repo instead
add a few files missed in push 1
several file fixups to pass lint (upstreamed in PR envoyproxy/envoy-mobile#2684)
removing proto and absl patches from E-M
edited EM workflows to run from the mobile directory and only run iff mobile/** paths changed (see diffs between first and second PR)
-- disabling swift lint because I can't get it to work.
-- disabling perf because it can't work on first check in (compares to clean head)
-- release validation because it's having OS issues

Risk Level: added EM CI
Testing: new EM tests
Docs Changes: n/a
Release Notes: none
most of #23758

@repokitteh-read-only
Copy link
Copy Markdown

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #24104 was opened by alyssawilk.

see: more, trace.

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk alyssawilk force-pushed the repo_merge_clean_diffs branch 9 times, most recently from d749f8d to 9f89d48 Compare November 21, 2022 18:42
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Copy link
Copy Markdown
Contributor

@RyanTheOptimist RyanTheOptimist left a comment

Choose a reason for hiding this comment

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

Exciting! Assuming this works (passes CI), LGTM!

Copy link
Copy Markdown
Contributor

@RyanTheOptimist RyanTheOptimist left a comment

Choose a reason for hiding this comment

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

Exciting! Assuming this works (passes CI), LGTM!

@alyssawilk alyssawilk enabled auto-merge (squash) November 21, 2022 21:02
@alyssawilk alyssawilk merged commit 64555aa into envoyproxy:main Nov 21, 2022
DavidKorczynski pushed a commit to google/oss-fuzz that referenced this pull request Nov 28, 2022
Following the Envoy-Mobile [project
merge](envoyproxy/envoy#24104) this PR fixes the
bazel query to fetch the fuzzers.

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
Comment thread .github/workflows/commands.yml Outdated

jobs:
retest:
name: Retest
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

FYI this means that /retest won't retest failed GitHub Actions jobs.

Where could I look at how Repokitteh is setup so maybe I could teach it to do that?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm fine adding it back, I just was trying to start with CI workflows that verified we didn't break the build :-)
repokitteh files for Envoy are here: ci/repokitteh/modules

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

related #24156

submodules: true
- name: Add safe directory
run: git config --global --add safe.directory /__w/envoy-mobile/envoy-mobile
run: git config --global --add safe.directory /__w/envoy/envoy
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think these are needed anymore because there's no git submodule involved anymore, just the main git repo.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

CI broke without them, and told me to add them back.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Odd.

env:
DEVELOPER_DIR: /Applications/Xcode_14.1.app
run: ./bazelw run @DrString//:drstring check
DEVELOPER_DIR: /Applications/Xcode_14.0.app
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why did we revert from Xcode 14.1 to Xcode 14.0 here?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

argh, my original pull was before the bump and the . files kept being problematic. will fix thanks for the catch

alyssawilk pushed a commit that referenced this pull request Nov 29, 2022
Commit Message: Add missing .bazelproject files. This fixes a dev workflow which allows us to run example/test applications from within Android Studio IDE. The addition of the .bazelrpoject was most probably missed in #24104 as dot files are ignored by default in Envoy repo.
Risk Level: Low
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

Signed-off-by: Rafal Augustyniak <raugustyniak@lyft.com>
eamonnmcmanus pushed a commit to eamonnmcmanus/oss-fuzz that referenced this pull request Mar 15, 2023
Following the Envoy-Mobile [project
merge](envoyproxy/envoy#24104) this PR fixes the
bazel query to fetch the fuzzers.

Signed-off-by: Adi Suissa-Peleg <adip@google.com>

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
@alyssawilk alyssawilk deleted the repo_merge_clean_diffs branch April 5, 2023 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants