commit index.js (#33)

Co-authored-by: chengke <[email protected]>

Author: cheng-kevin

robomaker-sample-app-ci/dist/index.js

@@ -787,7 +787,7 @@ function getSampleAppVersion() {
         try {
             yield exec.exec("bash", [
                 "-c",
-                "find ../robot_ws -name package.xml -exec grep -Po '(?<=<version>)[^\\s<>]*(?=</version>)' {} +"
+                "find ../robot_ws -name package.xml -not -path ../robot_ws/src/deps/* -exec grep -Po '(?<=<version>)[^\\s<>]*(?=</version>)' {} +"
             ], getWorkingDirExecOptions(grepAfter));
             version = grepAfter.stdout.trim();
         }
@@ -829,6 +829,9 @@ function fetchRosinstallDependencies() {
 function setup() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            //this function relies on the fact that there is only 1 package.xml in ./robot_ws
+            SAMPLE_APP_VERSION = yield getSampleAppVersion();
+            console.log(`Sample App version found to be: ${SAMPLE_APP_VERSION}`);
             if (!fs.existsSync("/etc/timezone")) {
                 //default to US Pacific if timezone is not set.
                 const timezone = "US/Pacific";
@@ -840,8 +843,6 @@ function setup() {
             yield exec.exec("apt-get", ["update"]);
             //zip required for prepare_sources step.
             yield exec.exec("apt-get", ["install", "-y", "zip"]);
-            SAMPLE_APP_VERSION = yield getSampleAppVersion();
-            console.log(`Sample App version found to be: ${SAMPLE_APP_VERSION}`);
             let packages = yield fetchRosinstallDependencies();
             PACKAGES = packages.join(" ");
         }