mirror of
https://github.com/google/nomulus.git
synced 2025-04-29 19:47:51 +02:00
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
This commit is contained in:
parent
9598d03ee3
commit
338906d87f
1 changed files with 2 additions and 1 deletions
|
@ -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')
|
||||
|
|
Loading…
Add table
Reference in a new issue