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

deps/mobile: Bump bazel -> 6.3.1, rules_java -> 6.4.0, io_bazel_rules_kotlin -> 1.8 #28854

Merged
merged 5 commits into from
Aug 11, 2023

Conversation

phlax
Copy link
Member

@phlax phlax commented Aug 5, 2023

Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
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 Aug 5, 2023
@phlax phlax marked this pull request as draft August 5, 2023 13:03
@repokitteh-read-only
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 @RyanTheOptimist

🐱

Caused by: #28854 was opened by phlax.

see: more, trace.

@phlax
Copy link
Member Author

phlax commented Aug 5, 2023

not sure if this will work and whether bazelbuild/rules_java#64 is resolved - but essentially trying to unblock bazel upgrade

@phlax phlax force-pushed the deps-bump-mobile-rules_java branch from c4b26b8 to a70e1f2 Compare August 8, 2023 18:28
@phlax phlax changed the title [WIP/TESTING] mobile/deps: Bump rules_java -> 6.4.0 deps/mobile: Bump bazel -> 6.3.1, rules_java -> 6.4.0 Aug 8, 2023
@phlax phlax marked this pull request as ready for review August 8, 2023 18:39
RyanTheOptimist
RyanTheOptimist previously approved these changes Aug 8, 2023
Copy link
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.

Assuming this passes CI, LGTM. WOO HOO!!!

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Aug 8, 2023
@phlax
Copy link
Member Author

phlax commented Aug 8, 2023

/retest mobile transients

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Aug 8, 2023
@phlax phlax changed the title deps/mobile: Bump bazel -> 6.3.1, rules_java -> 6.4.0 deps/mobile: Bump bazel -> 6.3.1, rules_java -> 6.4.0, io_bazel_rules_kotlin -> 1.8 Aug 8, 2023
@RyanTheOptimist
Copy link
Contributor

/retest

@phlax phlax force-pushed the deps-bump-mobile-rules_java branch from 11d31ae to f51393d Compare August 9, 2023 09:14
@phlax
Copy link
Member Author

phlax commented Aug 9, 2023

/retest mobile

@phlax
Copy link
Member Author

phlax commented Aug 9, 2023

/retest

@phlax phlax force-pushed the deps-bump-mobile-rules_java branch 4 times, most recently from f26f430 to 1854103 Compare August 10, 2023 09:11
strip_prefix = "rules_java-6.4.0",
url = "https://github.com/bazelbuild/rules_java/archive/6.4.0.tar.gz",
patch_args = ["-p1"],
patches = ["@envoy//bazel:rules_java.patch"],
Copy link
Member

Choose a reason for hiding this comment

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

should we have a TODO for when we can drop this patch?

Copy link
Member Author

Choose a reason for hiding this comment

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

i can add - when is that ?

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure, i guess when that linked issue is fixed, or bazelbuild/bazel#17085

@phlax
Copy link
Member Author

phlax commented Aug 10, 2023

@keith unfortunately its still failing mobile CI - we are now down to issues related to the rules_java upgade - any help resolving these would be much appreciated!

@phlax phlax force-pushed the deps-bump-mobile-rules_java branch from 1854103 to 920f1f5 Compare August 10, 2023 20:53
@phlax phlax force-pushed the deps-bump-mobile-rules_java branch from 920f1f5 to f72b133 Compare August 11, 2023 10:16
phlax and others added 5 commits August 11, 2023 18:40
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Hamilton <rch@google.com>

Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax phlax force-pushed the deps-bump-mobile-rules_java branch from f72b133 to 2923310 Compare August 11, 2023 17:40
@phlax phlax enabled auto-merge (squash) August 11, 2023 18:04
@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Aug 11, 2023
@phlax phlax merged commit b9d9a74 into envoyproxy:main Aug 11, 2023
phlax added a commit to phlax/envoy that referenced this pull request Aug 16, 2023
…rules_kotlin` -> 1.8 (envoyproxy#28854)

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: Ryan Hamilton <rch@google.com>
phlax added a commit to phlax/envoy that referenced this pull request Aug 16, 2023
…rules_kotlin` -> 1.8 (envoyproxy#28854)

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: Ryan Hamilton <rch@google.com>

Signed-off-by: phlax <phlax@users.noreply.github.com>
phlax added a commit to phlax/envoy that referenced this pull request Aug 17, 2023
…o_bazel_rules_kotlin` -> 1.8 (envoyproxy#28854)"

This reverts commit b9d9a74.

Signed-off-by: Ryan Northey <ryan@synca.io>
phlax added a commit to phlax/envoy that referenced this pull request Aug 17, 2023
…o_bazel_rules_kotlin` -> 1.8 (envoyproxy#28854)"

This reverts commit b9d9a74.

Signed-off-by: Ryan Northey <ryan@synca.io>
phlax added a commit to phlax/envoy that referenced this pull request Aug 17, 2023
….4.0, `io_bazel_rules_kotlin` -> 1.8 (envoyproxy#28854)""

This reverts commit c7147a8.

Signed-off-by: Ryan Northey <ryan@synca.io>
alyssawilk added a commit to alyssawilk/envoy that referenced this pull request Aug 17, 2023
phlax added a commit that referenced this pull request Aug 21, 2023
…rules_kotlin` -> 1.8 (#28854)

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: Ryan Hamilton <rch@google.com>
phlax added a commit that referenced this pull request Aug 22, 2023
…rules_kotlin` -> 1.8 (#28854)

Signed-off-by: Ryan Northey <ryan@synca.io>
Co-authored-by: Ryan Hamilton <rch@google.com>

Signed-off-by: phlax <phlax@users.noreply.github.com>
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.

3 participants