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

Upgrade build dependencies #629

Merged
merged 8 commits into from Sep 14, 2022
Merged

Conversation

elliotmjackson
Copy link
Contributor

@elliotmjackson elliotmjackson commented Sep 8, 2022

  1. Support arm64 and amd64 in Dockerfile
  2. Upgrade Go dependencies
  3. update Bazel dependencies from Go mod

Elliot Jackson added 5 commits September 8, 2022 14:52
Signed-off-by: Elliot Jackson <elliot@buf.build>
Signed-off-by: Elliot Jackson <elliot@buf.build>
Signed-off-by: Elliot Jackson <elliot@buf.build>
Signed-off-by: Elliot Jackson <elliot@buf.build>
Signed-off-by: Elliot Jackson <elliot@buf.build>
Copy link
Member

@akshayjshah akshayjshah left a comment

Choose a reason for hiding this comment

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

I'm confused by the :validate_go change. Can you explain what's happening to me?

Dockerfile Outdated Show resolved Hide resolved
bazel/dependency_imports.bzl Outdated Show resolved Hide resolved
dependencies.bzl Show resolved Hide resolved
requirements.txt Show resolved Hide resolved
@@ -55,7 +55,7 @@ java_proto_library(

alias(
name = "go_default_library",
actual = ":validate_go",
Copy link
Member

Choose a reason for hiding this comment

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

I don't understand. If we've removed this, why are we changing to //validate:validate_go elsewhere in this diff?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

adding offline comments here....

The only thing i did is get the dockerfile to run on arm machines and update the go version, consequently the go mod and bazel/repositories.bzl with later versions…once i did this, i synced up the bazel repos from the go mod with

bazel run //:gazelle -- update-repos -from_file=go.mod -prune -to_macro=dependencies.bzl%go_third_party

thats when it went as made the huge diff 😛 I dont have a bazel-vocab so please excuse me. You can see everything bazel/gazelle did in commit ea5d03e… Updating bazel rules in bazel/repositories.bzl was all me - needed to happen to enable an arm build. Trying to simulate amd was impossible, my machine quickly ran out of memory.

Signed-off-by: Elliot Jackson <elliot@buf.build>
Elliot Jackson added 2 commits September 13, 2022 10:19
Signed-off-by: Elliot Jackson <elliot@buf.build>
Signed-off-by: Elliot Jackson <elliot@buf.build>
Copy link
Member

@akshayjshah akshayjshah left a comment

Choose a reason for hiding this comment

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

Looks good! After landing this, can you upgrade envoyproxy/envoy and make sure everything works?

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

2 participants