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

[WIP] deps: Bump rules_antlr -> 0.5.0, antlr_runtimes -> 4.9.2 #18523

Closed
wants to merge 4 commits into from

Conversation

phlax
Copy link
Member

@phlax phlax commented Oct 8, 2021

Signed-off-by: Ryan Northey [email protected]

Commit Message: deps: Bump rules_antlr -> 0.5.0
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue] Fix #18342 Fix #18316
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]

@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).

🐱

Caused by: #18523 was opened by phlax.

see: more, trace.

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

phlax commented Oct 8, 2021

fails with

ERROR: error loading package '': in /source/bazel/dependency_imports.bzl: cannot load '@rules_antlr//antlr:deps.bzl': no such file

@phlax phlax changed the title deps: Bump rules_antlr -> 0.5.0 [WIP] deps: Bump rules_antlr -> 0.5.0 Oct 8, 2021
@phlax phlax marked this pull request as draft October 8, 2021 10:44
@moderation
Copy link
Contributor

This is another one that will need to be bumped with the WASM stuff. You may need to bump the Antlr runtime and I know the way to configure that in Bazel changed a lot in 4.8.

phlax added 2 commits October 25, 2021 13:29
Signed-off-by: Ryan Northey <[email protected]>
@phlax phlax force-pushed the deps-bump-rules-antlr branch from 67c8ef7 to 74125d8 Compare October 25, 2021 12:29
@phlax phlax changed the title [WIP] deps: Bump rules_antlr -> 0.5.0 [WIP] deps: Bump rules_antlr -> 0.5.0, antlr_runtimes -> 4.9.2 Oct 25, 2021
@phlax
Copy link
Member Author

phlax commented Oct 25, 2021

currently 4.9.1+ is not supported by rules_antlr - not sure what the hold up is, but the PR to resolve is here https://github.com/marcohu/rules_antlr/pull/14/files

not sure that fixes the problem we are seeing in CI about missing re/moved deps.bzl

@moderation
Copy link
Contributor

This is another one that is WASM related. I have it working in my local branch but without @PiotrSikora and team engaged it is hard to bump these deps in isolation.

diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index b382e3fd0..7f217c45b 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -6,12 +6,12 @@ load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependenci
 load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
 load("@upb//bazel:workspace_deps.bzl", "upb_deps")
 load("@rules_rust//rust:repositories.bzl", "rust_repositories")
-load("@rules_antlr//antlr:deps.bzl", "antlr_dependencies")
+load("@rules_antlr//antlr:repositories.bzl", "rules_antlr_dependencies")
 load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_dependencies")
 load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")

 # go version for rules_go
-GO_VERSION = "1.15.5"
+GO_VERSION = "1.17.2"

 def envoy_dependency_imports(go_version = GO_VERSION):
     # TODO: allow building of tools for easier onboarding
@@ -22,7 +22,7 @@ def envoy_dependency_imports(go_version = GO_VERSION):
     apple_rules_dependencies()
     rust_repositories()
     upb_deps()
-    antlr_dependencies(472)
+    rules_antlr_dependencies("4.8")
     proxy_wasm_rust_sdk_dependencies()
     rules_fuzzing_dependencies(

@phlax
Copy link
Member Author

phlax commented Oct 25, 2021

ill add ~your patch as i think that will get us past the deps.bzl issue at least

not sure if the go bump is required, but probs best to do that elsewhere (/first if required)

Signed-off-by: Ryan Northey <[email protected]>
@moderation
Copy link
Contributor

Ignore go version - that is just what I run locally and it should be changed in the multiple rules_go PRs out there

@phlax
Copy link
Member Author

phlax commented Oct 25, 2021

k, so now it fails on the expected rules_antlr compat - i guess this one can wait until that has been updated

Signed-off-by: Ryan Northey <[email protected]>
@phlax
Copy link
Member Author

phlax commented Oct 28, 2021

i guess this one can wait until that has been updated

checking this further - the repo seems to be unmaintained - i opened a ticket to clarify this here marcohu/rules_antlr#19

I have also created a PR to update with a patch for 4.9.2 runtime here marcohu/rules_antlr#20 and ive set this PR to use the patch

@github-actions
Copy link

This pull request has been automatically marked as stale because it has not had activity in the last 30 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

@github-actions github-actions bot added the stale stalebot believes this issue/PR has not been touched recently label Nov 27, 2021
@github-actions
Copy link

github-actions bot commented Dec 4, 2021

This pull request has been automatically closed because it has not had activity in the last 37 days. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

@github-actions github-actions bot closed this Dec 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deps Approval required for changes to Envoy's external dependencies stale stalebot believes this issue/PR has not been touched recently
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Newer release available rules_antlr: 0.5.0 Newer release available antlr4_runtimes: 4.9.2
2 participants