[beam] branch master updated: [BEAM-11111] Fix website publish to use stable directory so that .git directory can be found.

[lc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 037b2ca  [BEAM-11111] Fix website publish to use stable directory so that .git directory can be found.
     new c9b7d91  Merge pull request #13179 from lukecwik/beam11111
037b2ca is described below

commit 037b2ca09942e0ea860fafe8a6cbd7d061af3278
Author: Luke Cwik <lc...@google.com>
AuthorDate: Fri Oct 23 11:39:08 2020 -0700

    [BEAM-11111] Fix website publish to use stable directory so that .git directory can be found.
---
 .test-infra/metrics/build.gradle | 2 +-
 website/build.gradle             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.test-infra/metrics/build.gradle b/.test-infra/metrics/build.gradle
index e2e25c1..4dc7157 100644
--- a/.test-infra/metrics/build.gradle
+++ b/.test-infra/metrics/build.gradle
@@ -64,7 +64,7 @@ task checkLastCommitId {
   doLast {
     assert grgit : 'Cannot use outside of git repository'
 
-    def git = grgit.open()
+    def git = grgit.open(currentDir: project.rootDir)
     def lastCommit = git.log(paths: ['.test-infra/metrics'], maxCommits: 1)[0]
     project.ext.lastCommitId = lastCommit.abbreviatedId
   }
diff --git a/website/build.gradle b/website/build.gradle
index c203758..6ea9e2a 100644
--- a/website/build.gradle
+++ b/website/build.gradle
@@ -267,7 +267,7 @@ task commitWebsite {
     assert !file("${buildContentDir('apache')}/documentation/sdks/javadoc").exists()
     assert !file("${buildContentDir('apache')}/documentation/sdks/pydoc").exists()
 
-    def git = grgit.open()
+    def git = grgit.open(currentDir: project.rootDir)
     // get the latest commit on master
     def latestCommit = grgit.log(maxCommits: 1)[0].abbreviatedId
 
@@ -320,7 +320,7 @@ task publishWebsite {
   doLast {
     assert grgit : "Cannot publish website outside of git repository"
 
-    def git = grgit.open()
+    def git = grgit.open(currentDir: project.rootDir)
     git.checkout(branch: 'asf-site')
     if (!commitedChanges) {
       println 'No changes to push'