Move kotlin home modification as part of buckw

uber · Jul 15, 2020 · 07c1c2d · 07c1c2d
1 parent 35a2d79
commit 07c1c2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/buildSrc/src/main/rocker/com/uber/okbuck/template/config/BuckWrapper.rocker.raw b/buildSrc/src/main/rocker/com/uber/okbuck/template/config/BuckWrapper.rocker.raw
@@ -209,6 +209,17 @@ setupBuckRun ( ) {
  fi
 
  setupBuckBinary
+
+ # Replace kotlin_home config with full path instead of source path
+ local kotlin_home
+ kotlin_home=$("$BUCK_BINARY" audit config kotlin.kotlin_home)
+
+ if [[ "$kotlin_home" == *":kotlin_home"* ]]; then
+ echo "changing kotlin home"
+ local resolved_kotlin_home
+ resolved_kotlin_home=$("$BUCK_BINARY" build //.okbuck/workspace/kotlin_home:kotlin_home --show-output | awk '{print $2}')
+ sed -i.bak "s://.okbuck/workspace/kotlin_home\:kotlin_home:${resolved_kotlin_home}:g" .okbuck/config/okbuck.buckconfig
+ fi
 }
 
 setupBuckFlags ( ) {

diff --git a/tooling/ci/build_cmd.sh b/tooling/ci/build_cmd.sh
@@ -6,8 +6,6 @@ if [ -z "$BUILD_CMD" ]; then
 fi
 
 SKIP_OKBUCK= ./buckw --version
-export RESOLVED_KOTLIN_HOME=$(./buckw build //.okbuck/workspace/kotlin_home:kotlin_home --show-output | awk '{print $2}')
-sed -i.bak "s://.okbuck/workspace/kotlin_home\:kotlin_home:${RESOLVED_KOTLIN_HOME}:g" .okbuck/config/okbuck.buckconfig
 
 echo "Running BUILD_CMD: $BUILD_CMD"