From dad6f57d6db61827c07a537b667af01be4172152 Mon Sep 17 00:00:00 2001 From: Laramie Leavitt Date: Mon, 21 Mar 2016 16:56:03 -0700 Subject: [PATCH] Update WORKSPACE / BUILD to work with bazel at HEAD. Uses external rules_go github repository. --- BUILD | 7 +----- README.md | 2 ++ WORKSPACE | 8 ++++++- hello.go | 6 ++++- local.go | 10 --------- local/BUILD | 6 ++--- submodule/BUILD | 22 +++++++++---------- submodule/src/remote | 2 +- vendor/github.com/laramiel/BUILD | 4 ++-- .../laramiel/bazel-example-golang-remote | 2 +- with_vendor/BUILD | 12 +++++----- 11 files changed, 39 insertions(+), 42 deletions(-) delete mode 100644 local.go diff --git a/BUILD b/BUILD index 736307b..8e18cb3 100644 --- a/BUILD +++ b/BUILD @@ -1,4 +1,4 @@ -load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_binary") +load("@io_bazel_rules_go//go:def.bzl", "go_prefix", "go_binary") package( default_visibility = ["//visibility:public"], @@ -9,11 +9,6 @@ go_prefix("github.com/laramiel/bazel-example-golang/") go_binary( name = "hello", srcs = ["hello.go"], -) - -go_binary( - name = "local", - srcs = ["local.go"], deps = [ "//local", ], diff --git a/README.md b/README.md index f2ef6bb..cb94d90 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ This requires bazel release > `bazel-0.20`. ``` $ git clone https://github.com/laramiel/bazel-example-golang.git $ cd bazel-example-golang +$ git submodule init +$ git submodule foreach git pull origin master $ bazel run :hello diff --git a/WORKSPACE b/WORKSPACE index 0514ea8..fa0ba30 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,4 +1,10 @@ -load("@bazel_tools//tools/build_rules/go:def.bzl", "go_repositories") +git_repository( + name = "io_bazel_rules_go", + remote = "https://github.com/bazelbuild/rules_go.git", + commit = "373feb6", +) + +load("@io_bazel_rules_go//go:def.bzl", "go_repositories") go_repositories() diff --git a/hello.go b/hello.go index d390d7c..78f4855 100644 --- a/hello.go +++ b/hello.go @@ -1,9 +1,13 @@ -package main +package main import ( "fmt" + + "github.com/laramiel/bazel-example-golang/local/local" ) func main() { fmt.Println("Hello World") + + fmt.Println("Hello ", local.World()) } diff --git a/local.go b/local.go deleted file mode 100644 index 1eacd5d..0000000 --- a/local.go +++ /dev/null @@ -1,10 +0,0 @@ -package main - -import ( - "fmt" - "github.com/laramiel/bazel-example-golang/local/local" -) - -func main() { - fmt.Println("Hello ", local.World()) -} diff --git a/local/BUILD b/local/BUILD index f0d58ab..cb869a0 100644 --- a/local/BUILD +++ b/local/BUILD @@ -1,7 +1,7 @@ -load("@bazel_tools//tools/build_rules/go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( - name ="local", - srcs = [ "local.go" ], + name ="local", + srcs = [ "local.go" ], visibility = ["//visibility:public"], ) diff --git a/submodule/BUILD b/submodule/BUILD index 925552e..f37750b 100644 --- a/submodule/BUILD +++ b/submodule/BUILD @@ -1,21 +1,21 @@ -load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_binary") +load("@io_bazel_rules_go//go:def.bzl", "go_binary") package( default_visibility = ["//visibility:public"], ) go_binary( - name ="bare", - srcs = [ "bare.go" ], - deps = [ - "//submodule/src:bare", - ], + name = "bare", + srcs = ["bare.go"], + deps = [ + "//submodule/src:bare", + ], ) go_binary( - name ="remote", - srcs = [ "remote.go" ], - deps = [ - "//submodule/src/remote", - ], + name = "remote", + srcs = ["remote.go"], + deps = [ + "//submodule/src/remote", + ], ) diff --git a/submodule/src/remote b/submodule/src/remote index 8f2e405..4a9199b 160000 --- a/submodule/src/remote +++ b/submodule/src/remote @@ -1 +1 @@ -Subproject commit 8f2e405bb9a24a3b30a54f4c967b630a0bade236 +Subproject commit 4a9199be6e845f394aad17f8ca9e5ea242281ed5 diff --git a/vendor/github.com/laramiel/BUILD b/vendor/github.com/laramiel/BUILD index 26a863a..5593364 100644 --- a/vendor/github.com/laramiel/BUILD +++ b/vendor/github.com/laramiel/BUILD @@ -1,7 +1,7 @@ -load("@bazel_tools//tools/build_rules/go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "bare", - srcs = [ "bazel-example-golang-bare/bare.go" ], + srcs = ["bazel-example-golang-bare/bare.go"], visibility = ["//visibility:public"], ) diff --git a/vendor/github.com/laramiel/bazel-example-golang-remote b/vendor/github.com/laramiel/bazel-example-golang-remote index 8f2e405..4a9199b 160000 --- a/vendor/github.com/laramiel/bazel-example-golang-remote +++ b/vendor/github.com/laramiel/bazel-example-golang-remote @@ -1 +1 @@ -Subproject commit 8f2e405bb9a24a3b30a54f4c967b630a0bade236 +Subproject commit 4a9199be6e845f394aad17f8ca9e5ea242281ed5 diff --git a/with_vendor/BUILD b/with_vendor/BUILD index 647db8d..673c652 100644 --- a/with_vendor/BUILD +++ b/with_vendor/BUILD @@ -1,4 +1,4 @@ -load("@bazel_tools//tools/build_rules/go:def.bzl", "go_prefix", "go_binary") +load("@io_bazel_rules_go//go:def.bzl", "go_binary") package( default_visibility = ["//visibility:public"], @@ -16,9 +16,9 @@ package( #) go_binary( - name ="remote", - srcs = [ "remote.go" ], - deps = [ - "//vendor/github.com/laramiel/bazel-example-golang-remote:remote", - ], + name = "remote", + srcs = ["remote.go"], + deps = [ + "//vendor/github.com/laramiel/bazel-example-golang-remote:remote", + ], )