From f1a9afdf1781a93a8847a11b350b376f00f5c307 Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Sun, 8 Sep 2019 19:49:00 +0200
Subject: [PATCH] Clean before running daml build (#2816)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should hopefully fix some of the flakiness we’ve been seeing on
Windows. Not entirely sure what’s going wrong without the clean but
since this only happens the lack of sandboxing seems like the most
likely difference.
---
 triggers/daml/BUILD.bazel  | 12 ++++++++----
 triggers/tests/BUILD.bazel | 14 +++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/triggers/daml/BUILD.bazel b/triggers/daml/BUILD.bazel
index 2ec7c0d4b0..fd713f3918 100644
--- a/triggers/daml/BUILD.bazel
+++ b/triggers/daml/BUILD.bazel
@@ -9,17 +9,21 @@ genrule(
     srcs = glob(["**/*.daml"]),
     outs = ["trigger.dar"],
     cmd = """
-      cat << EOF > daml.yaml
+      set -eou pipefail
+      TMP_DIR=$$(mktemp -d)
+      mkdir -p $$TMP_DIR/daml/Daml
+      cp -L $(location Daml/Trigger.daml) $$TMP_DIR/daml/Daml
+      cat << EOF > $$TMP_DIR/daml.yaml
 sdk-version: 0.0.0
 name: trigger
-source: triggers/daml
+source: daml
 version: 0.0.1
 dependencies:
   - daml-stdlib
   - daml-prim
 EOF
-
-      $(location //compiler/damlc) build -o $(location trigger.dar)
+      $(location //compiler/damlc) build --project-root=$$TMP_DIR -o $$PWD/$(location trigger.dar)
+      rm -rf $$TMP_DIR
     """,
     tools = ["//compiler/damlc"],
     visibility = ["//visibility:public"],
diff --git a/triggers/tests/BUILD.bazel b/triggers/tests/BUILD.bazel
index cb4d7ded3d..17fcd23f38 100644
--- a/triggers/tests/BUILD.bazel
+++ b/triggers/tests/BUILD.bazel
@@ -19,18 +19,22 @@ genrule(
     outs = ["acs.dar"],
     cmd = """
       set -eou pipefail
-      cat << EOF > daml.yaml
+      TMP_DIR=$$(mktemp -d)
+      mkdir -p $$TMP_DIR/daml
+      cp -L $(location :daml/ACS.daml) $$TMP_DIR/daml
+      cp -L $(location //triggers/daml:trigger.dar) $$TMP_DIR/
+      cat << EOF > $$TMP_DIR/daml.yaml
 sdk-version: 0.0.0
 name: acs
-source: triggers/tests/daml
+source: daml
 version: 0.0.1
 dependencies:
   - daml-stdlib
   - daml-prim
-  - $(location //triggers/daml:trigger.dar)
+  - trigger.dar
 EOF
-
-      $(location //compiler/damlc) build -o $(location acs.dar)
+      $(location //compiler/damlc) build --project-root=$$TMP_DIR -o $$PWD/$(location acs.dar)
+      rm -rf $$TMP_DIR
     """,
     tools = ["//compiler/damlc"],
     visibility = ["//visibility:public"],