From 35409253339aa1b0172453a0900aa720d573e0b3 Mon Sep 17 00:00:00 2001 From: Stevan Andjelkovic Date: Fri, 29 Jan 2021 15:17:56 +0100 Subject: [PATCH] bazel(sut): add json1 to gotags --- src/cli/cmd/BUILD.bazel | 2 ++ src/lib/default.nix | 6 ++++-- src/sut/broadcast/BUILD.bazel | 1 + src/sut/register/BUILD.bazel | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cli/cmd/BUILD.bazel b/src/cli/cmd/BUILD.bazel index dd507425..f869141a 100644 --- a/src/cli/cmd/BUILD.bazel +++ b/src/cli/cmd/BUILD.bazel @@ -6,8 +6,10 @@ go_library( "db.go", "debug.go", "generator.go", + "logger.go", "root.go", "scheduler.go", + "utils.go", "versions.go", ], importpath = "github.com/symbiont-io/detsys-testkit/src/cli/cmd", diff --git a/src/lib/default.nix b/src/lib/default.nix index 30821323..3c5c98ab 100644 --- a/src/lib/default.nix +++ b/src/lib/default.nix @@ -16,7 +16,9 @@ buildGoModule rec { vendorSha256 = "1dq4w81g3s26chpfqad3mqpybg4900646h2b2k6xsz295ds9qk7q"; postInstall = '' - mkdir -p $out - cp -R $src $out/src + mkdir -p $out/src + # Don't copy over bazel build file, or bazel will try to build that + # directory. + cp $(ls $src | grep -v BUILD.bazel) $out/src ''; } diff --git a/src/sut/broadcast/BUILD.bazel b/src/sut/broadcast/BUILD.bazel index 105055da..c3a265a1 100644 --- a/src/sut/broadcast/BUILD.bazel +++ b/src/sut/broadcast/BUILD.bazel @@ -15,6 +15,7 @@ go_test( name = "broadcast_test", srcs = ["broadcast_test.go"], embed = [":broadcast"], + gotags = ["json1"], deps = [ "//src/executor", "//src/lib", diff --git a/src/sut/register/BUILD.bazel b/src/sut/register/BUILD.bazel index 300247c5..8ad4a898 100644 --- a/src/sut/register/BUILD.bazel +++ b/src/sut/register/BUILD.bazel @@ -20,6 +20,7 @@ go_test( name = "register_test", srcs = ["example_test.go"], embed = [":register"], + gotags = ["json1"], deps = [ "//src/executor", "//src/lib",