Skip to content

Commit

Permalink
ci: don't depend on system patch for go_googleapis dep (#493)
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan authored Jul 23, 2023
1 parent 9fbad40 commit 787519d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
5 changes: 4 additions & 1 deletion WORKSPACE
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
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

0 comments on commit 787519d

Please sign in to comment.