From 95fdd36c7751915efca672dff5a1fb7d3f12c9ce Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Wed, 28 Apr 2021 11:23:39 -0400 Subject: [PATCH] Make nom_build not check for ".git" directory (#1110) * Make nom_build not check for ".git" directory nom_build tries to verify that it is in the root of the tree prior to doing anything, however checking for a .git directory doesn't work in a merged directory. * Minor formatting fix to attempt to force rebuild --- config/nom_build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/nom_build.py b/config/nom_build.py index 1f8bdc920..10bff3a06 100644 --- a/config/nom_build.py +++ b/config/nom_build.py @@ -256,6 +256,7 @@ GRADLE_FLAGS = [ 'Specify a task to be excluded from execution.', True), ] + def generate_gradle_properties() -> str: """Returns the expected contents of gradle.properties.""" out = io.StringIO() @@ -270,7 +271,7 @@ def generate_gradle_properties() -> str: def get_root() -> str: """Returns the root of the nomulus build tree.""" cur_dir = os.getcwd() - if not os.path.exists(os.path.join(cur_dir, '.git')) or \ + if not os.path.exists(os.path.join(cur_dir, 'buildSrc')) or \ not os.path.exists(os.path.join(cur_dir, 'core')) or \ not os.path.exists(os.path.join(cur_dir, 'gradle.properties')): raise Exception('You must run this script from the root directory')