The SHA is in a different variable for different build types.

ben-clayton · May 17, 2017 · 2066dbf · 2066dbf
1 parent d94a351
commit 2066dbf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/kokoro/linux/build.sh b/kokoro/linux/build.sh
@@ -56,8 +56,9 @@ git submodule update --init
 
 # Invoke the build. At this point, only ensure that the tests build, but don't
 # execute the tests.
+BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT}
 echo $(date): Starting build...
-./do build --test build --buildnum $KOKORO_BUILD_NUMBER --buildsha $KOKORO_GITHUB_COMMIT
+./do build --test build --buildnum $KOKORO_BUILD_NUMBER --buildsha "$BUILD_SHA"
 echo $(date): Build completed.
 
 # Build the release packages.

diff --git a/kokoro/macos/build.sh b/kokoro/macos/build.sh
@@ -61,8 +61,9 @@ git submodule update --init
 
 # Invoke the build. At this point, only ensure that the tests build, but don't
 # execute the tests.
+BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT}
 echo $(date): Starting build...
-./do build --test build --buildnum $KOKORO_BUILD_NUMBER --buildsha $KOKORO_GITHUB_COMMIT
+./do build --test build --buildnum $KOKORO_BUILD_NUMBER --buildsha "$BUILD_SHA"
 echo $(date): Build completed.
 
 # Build the release packages.

diff --git a/kokoro/windows/build.bat b/kokoro/windows/build.bat
@@ -59,7 +59,12 @@ git submodule update --init
 REM Invoke the build. At this point, only ensure that the tests build, but don't
 REM execute the tests.
 echo %DATE% %TIME%
-call do.bat build --test build --buildnum %KOKORO_BUILD_NUMBER% --buildsha %KOKORO_GITHUB_COMMIT%
+if "%KOKORO_GITHUB_COMMIT%." == "." (
+  set BUILD_SHA=%KOKORO_GITHUB_PULL_REQUEST_COMMIT%
+) else (
+  set BUILD_SHA=%KOKORO_GITHUB_COMMIT%
+)
+call do.bat build --test build --buildnum %KOKORO_BUILD_NUMBER% --buildsha "%BUILD_SHA%"
 if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL%
 echo %DATE% %TIME%
 cd %BUILD_ROOT%