Conformance tests work under Bazel.

1 files changed, 15 insertions, 9 deletions

diff --git a/WORKSPACE b/WORKSPACE
index 299bfa7..b4d19c5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,6 +2,7 @@
 workspace(name = "upb")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "lua",
@@ -14,13 +15,12 @@ http_archive(
     ],
 )
 
-http_archive(
+git_repository(
     name = "com_google_protobuf",
-    sha256 = "d7a221b3d4fb4f05b7473795ccea9e05dab3b8721f6286a95fffbffc2d926f8b",
-    strip_prefix = "protobuf-3.6.1",
-    urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.zip"
-    ],
+    commit = "25feb59620627b673df76813dfd66e3f565765e7",
+    #sha256 = "d7a221b3d4fb4f05b7473795ccea9e05dab3b8721f6286a95fffbffc2d926f8b",
+    remote = "https://github.com/haberman/protobuf.git",
+    #tag = "conformance-build-tag",
 )
 
 http_archive(
@@ -28,7 +28,13 @@ http_archive(
     sha256 = "5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f",
     build_file = "//:ragel.BUILD",
     strip_prefix = "ragel-6.10",
-    urls = [
-        "http://www.colm.net/files/ragel/ragel-6.10.tar.gz"
-    ],
+    urls = ["http://www.colm.net/files/ragel/ragel-6.10.tar.gz"],
+)
+
+# Used by protobuf.
+http_archive(
+    name = "bazel_skylib",
+    sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d",
+    strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b",
+    urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
 )