From c814e5ac0edc408462c60aeb43cc6f91a1d448df Mon Sep 17 00:00:00 2001 From: Alan Myrvold Date: Tue, 2 Oct 2018 07:21:15 -0700 Subject: [PATCH 1/2] [BEAM-4496] Fix #3 for branch fetch failure on job_PostCommit_Website_Publish --- website/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/build.gradle b/website/build.gradle index fd9c55a667c0..f5b476670856 100644 --- a/website/build.gradle +++ b/website/build.gradle @@ -126,7 +126,7 @@ task commitWebsite << { // get the latest commit on master def latestCommit = grgit.log(maxCommits: 1)[0].abbreviatedId - shell "git fetch ${gitboxUrl} asf-site" + shell "git fetch ${gitboxUrl}" git.checkout(branch: 'asf-site') shell "git reset --hard origin/asf-site" From 02051995327edbc691d841aa2d95ea707de83d3b Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Tue, 2 Oct 2018 09:56:22 -0700 Subject: [PATCH 2/2] fixup! Ensure git fetch command works even without remote mapping config --- website/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/build.gradle b/website/build.gradle index f5b476670856..26cf0f228fc4 100644 --- a/website/build.gradle +++ b/website/build.gradle @@ -126,9 +126,8 @@ task commitWebsite << { // get the latest commit on master def latestCommit = grgit.log(maxCommits: 1)[0].abbreviatedId - shell "git fetch ${gitboxUrl}" + shell "git fetch --force origin +asf-site:asf-site" git.checkout(branch: 'asf-site') - shell "git reset --hard origin/asf-site" // Delete the previous content. git.remove(patterns: [ 'website/generated-content' ])