From 3af18990f50d8f040038aaa08c41f5d27d62efb5 Mon Sep 17 00:00:00 2001 From: Eugene Kliuchnikov Date: Thu, 8 Feb 2018 14:38:10 +0100 Subject: [PATCH] Update go and closure bazel rules (#637) * Update go and closure bazel rules * Follow the new bazel go rules guide * Swap go & closure rules initialization * Update bazel to 0.10.0 in appveyor build --- WORKSPACE | 17 +++++++++-------- scripts/appveyor.yml | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e30edc0..b239745 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,16 +11,16 @@ maven_jar( git_repository( name = "io_bazel_rules_go", remote = "https://github.com/bazelbuild/rules_go.git", - tag = "0.5.5", + tag = "0.9.0", ) http_archive( name = "io_bazel_rules_closure", - strip_prefix = "rules_closure-0.4.2", - sha256 = "25f5399f18d8bf9ce435f85c6bbf671ec4820bc4396b3022cc5dc4bc66303609", + sha256 = "6691c58a2cd30a86776dd9bb34898b041e37136f2dc7e24cadaeaf599c95c657", + strip_prefix = "rules_closure-08039ba8ca59f64248bb3b6ae016460fe9c9914f", urls = [ - "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/0.4.2.tar.gz", - "https://github.com/bazelbuild/rules_closure/archive/0.4.2.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/08039ba8ca59f64248bb3b6ae016460fe9c9914f.tar.gz", + "https://github.com/bazelbuild/rules_closure/archive/08039ba8ca59f64248bb3b6ae016460fe9c9914f.tar.gz", # 2018-01-16 ], ) @@ -82,8 +82,9 @@ filegroup( )""", ) -load("@io_bazel_rules_go//go:def.bzl", "go_repositories") -go_repositories() - load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") closure_repositories() + +load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains") +go_rules_dependencies() +go_register_toolchains() diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index a825b22..f5f0c13 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -42,7 +42,7 @@ install: ) ) - IF "%BUILD_SYSTEM%"=="bazel" ( - appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.6.1/bazel-0.6.1-windows-x86_64.exe -FileName bazel.exe + appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.10.0/bazel-0.10.0-windows-x86_64.exe -FileName bazel.exe ) before_build: