From 3cb1605472f772b2c293a8d7af5b8611e0d70c66 Mon Sep 17 00:00:00 2001
From: Jinlin Zhang <jinlinzhang@fb.com>
Date: Thu, 14 May 2020 11:32:18 -0700
Subject: [PATCH] Make release process work (#2464)

* Added cache to CircleCI

* Revert "Added cache to CircleCI"

This reverts commit 573db13fd2a61f9b24b21cc465b872ef31e9e4b0.

* Upgraded to Python3 for docker build

* Upgraded to Python3 for docker build

* Upgrade Buck Release to python3

* Pass release info to ant build

* Fixed ant build for Windows
---
 build.xml                 |  7 +++++++
 programs/gen_buck_info.py | 13 ++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 82775c14882..9ed96b30253 100644
--- a/build.xml
+++ b/build.xml
@@ -117,6 +117,9 @@
       <isset property="jdk8_or_higher"/>
     </and>
   </condition>
+  <!-- Overridden by ant command line arguments-->
+  <property name="release.version" value=""/>
+  <property name="release.timestamp" value=""/>
 
   <fileset dir="${third-party.dir}/java" id="buck.jars">
     <include name="args4j/args4j-2.0.30.jar" />
@@ -1056,6 +1059,10 @@
       <arg value="programs/gen_buck_info.py"/>
       <arg value="--java-version"/>
       <arg value="${java.version}"/>
+      <arg value="--release-version"/>
+      <arg value="${release.version}"/>
+      <arg value="--release-timestamp"/>
+      <arg value="${release.timestamp}"/>
     </exec>
   </target>
 
diff --git a/programs/gen_buck_info.py b/programs/gen_buck_info.py
index 747a07b957b..1eecb7bcd46 100644
--- a/programs/gen_buck_info.py
+++ b/programs/gen_buck_info.py
@@ -29,9 +29,16 @@
 
 def main(argv):
     parser = argparse.ArgumentParser()
-    parser.add_argument("--release-version", help="The buck release version")
     parser.add_argument(
-        "--release-timestamp", help="The unix timestamp when the release happened"
+        "--release-version",
+        nargs = "?",
+        default = None,
+        help="The buck release version")
+    parser.add_argument(
+        "--release-timestamp",
+        nargs = "?",
+        default = None,
+        help="The unix timestamp when the release happened"
     )
     parser.add_argument(
         "--java-version",
@@ -52,7 +59,7 @@ def main(argv):
     candidate_paths = []
     vcs_module = None
     while vcs_module is None and os.path.dirname(path) != path:
-        while not os.path.exists(os.path.join(path, ".buckconfig")):
+        while not os.path.exists(os.path.join(path, ".buckconfig")) and os.path.dirname(path) != path:
             path = os.path.dirname(path)
         for vcs_dir, module in SUPPORTED_VCS.items():
             if os.path.exists(os.path.join(path, vcs_dir)):