Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dlb: upgrade to 8.8 #33834

Merged
merged 3 commits into from May 14, 2024
Merged

dlb: upgrade to 8.8 #33834

merged 3 commits into from May 14, 2024

Conversation

daixiang0
Copy link
Member

Commit Message: Upgrade libdlb to 8.8
Additional Description:
Risk Level: Low
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Apr 28, 2024
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @moderation

🐱

Caused by: #33834 was opened by daixiang0.

see: more, trace.

@daixiang0 daixiang0 changed the title dlb: upgrade to 8.8 [WIP] dlb: upgrade to 8.8 Apr 28, 2024
@daixiang0 daixiang0 marked this pull request as draft April 28, 2024 06:25
@daixiang0
Copy link
Member Author

daixiang0 commented Apr 28, 2024

Now the latest layout is like:

dlb
├── driver
│   └── dlb2
│       ├── user.h
└── libdlb
    ├── Makefile

I want to run make under libdlb dir and it depends on driver/dlb2/user.h.

I can not use filegroup() to include the user.h since it would make bazel cannot find Makefile.

I also tried to copy this header file into libdlb dir, but failed to find a way to do it.

@phlax is there a way to do it?

@daixiang0 daixiang0 marked this pull request as ready for review April 28, 2024 08:23
Copy link
Contributor

@adisuissa adisuissa left a comment

Choose a reason for hiding this comment

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

/wait

bazel/repositories_extra.bzl Outdated Show resolved Hide resolved
contrib/dlb/source/BUILD Show resolved Hide resolved
contrib/contrib_build_config.bzl Outdated Show resolved Hide resolved
@adisuissa adisuissa self-assigned this Apr 29, 2024
ci/do_ci.sh Outdated Show resolved Hide resolved
@phlax phlax marked this pull request as draft April 29, 2024 13:03
@daixiang0
Copy link
Member Author

@phlax @adisuissa sorry that I add some local changes here :(

@daixiang0 daixiang0 changed the title [WIP] dlb: upgrade to 8.8 dlb: upgrade to 8.8 May 7, 2024
@daixiang0 daixiang0 marked this pull request as ready for review May 7, 2024 02:38
@daixiang0
Copy link
Member Author

I try to move files into one dir by Bazel and fail, so I just move the file by patch.

Signed-off-by: Loong <loong.dai@intel.com>
Signed-off-by: Loong <loong.dai@intel.com>
Signed-off-by: Loong <loong.dai@intel.com>
Copy link
Contributor

@adisuissa adisuissa left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!
I'll let @phlax have the final say.

bazel/repositories.bzl Show resolved Hide resolved
Copy link
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

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

i would have preferred we avoid the patch altogether - but this is definitely better than the previous iteration

lgtm, thanks @daixiang0

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label May 14, 2024
@phlax phlax merged commit d969d5c into envoyproxy:main May 14, 2024
53 checks passed
@daixiang0 daixiang0 deleted the 8.8 branch May 15, 2024 02:07
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.

None yet

4 participants