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.

Sign up for GitHub

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

Jump to bottom

ci: don't depend on system patch for go_googleapis dep #493

Merged
merged 1 commit into from
Jul 23, 2023
Merged

ci: don't depend on system patch for go_googleapis dep #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ http_archive(
http_archive(
name = "io_bazel_rules_go",
patch_args = ["-p1"],
patches = ["//patches:rules_go.patch"],
patches = [
"//patches:rules_go.patch",
"//patches:rules_go.pr3617.patch",
],
sha256 = "19ef30b21eae581177e0028f6f4b1f54c66467017be33d211ab6fc81da01ea4d",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/v0.38.0/rules_go-v0.38.0.zip"],
)
Expand Down
21 changes: 21 additions & 0 deletions patches/rules_go.pr3617.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
commit 11d5bb9072ed7f73dd4b35017f11472e51cff8d1
Author: Alex Eagle <[email protected]>
Date: Wed Jul 5 12:31:08 2023 -0700

Revert "Make googleapis work on FreeBSD."

This reverts commit 62b1d302e2fb4af5646ead1eb135aaf5b3c1a0e4.

diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
index 44c2da30..467c9054 100644
--- a/go/private/repositories.bzl
+++ b/go/private/repositories.bzl
@@ -262,7 +262,7 @@ def go_rules_dependencies(force = False):
# releaser:patch-cmd gazelle -repo_root .
Label("//third_party:go_googleapis-gazelle.patch"),
],
- patch_args = ["-E", "-p1"],
+ patch_args = ["-p1"],
)

# releaser:upgrade-dep golang mock
Loading