This is an automated email from the ASF dual-hosted git repository.
ibzib 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 1cd8ea8 [BEAM-10315] Fix gradlew clean.
new 4688bc6 Merge pull request #12078 from ibzib/BEAM-10315
1cd8ea8 is described below
commit 1cd8ea8bc96adadd9a895c1b28ee10644662789b
Author: Kyle Weaver <kcwea...@google.com>
AuthorDate: Wed Jun 24 12:21:03 2020 -0700
[BEAM-10315] Fix gradlew clean.
---
.test-infra/metrics/build.gradle | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.test-infra/metrics/build.gradle b/.test-infra/metrics/build.gradle
index 1f7a1b3..e2e25c1 100644
--- a/.test-infra/metrics/build.gradle
+++ b/.test-infra/metrics/build.gradle
@@ -61,17 +61,20 @@ task preCommit {
}
task checkLastCommitId {
- assert grgit : 'Cannot use outside of git repository'
+ doLast {
+ assert grgit : 'Cannot use outside of git repository'
- def git = grgit.open()
- def lastCommit = git.log(paths: ['.test-infra/metrics'], maxCommits: 1)[0]
- project.ext.lastCommitId = lastCommit.abbreviatedId
+ def git = grgit.open()
+ def lastCommit = git.log(paths: ['.test-infra/metrics'], maxCommits: 1)[0]
+ project.ext.lastCommitId = lastCommit.abbreviatedId
+ }
}
// Checks if Grafana deployment needs to be updated and deploys changes, if
necessary.
// Grafana's images tags keep track of the last commit ID in
`.test-infra/metrics` path.
// The deployment needs to be updated if new commit appears.
task deploy {
+ dependsOn checkLastCommitId
doLast {
def stdout = new ByteArrayOutputStream()
exec {
