[
https://issues.apache.org/jira/browse/BEAM-4496?focusedWorklogId=149636&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-149636
]
ASF GitHub Bot logged work on BEAM-4496:
----------------------------------------
Author: ASF GitHub Bot
Created on: 29/Sep/18 12:53
Start Date: 29/Sep/18 12:53
Worklog Time Spent: 10m
Work Description: swegner commented on a change in pull request #6505:
[BEAM-4496] Fix branch fetch failure on job_PostCommit_Website_Publish
URL: https://github.com/apache/beam/pull/6505#discussion_r221427317
##########
File path: website/build.gradle
##########
@@ -170,19 +188,14 @@ task publishWebsite << {
println "Adding website-publish remote"
// Cannot authenticate to the default github uri, so specify gitbox.
git.remote.add(name: 'website-publish',
- url: 'https://gitbox.apache.org/repos/asf/beam.git',
- pushRefSpecs: ['refs/heads/asf-site'])
+ url: 'https://gitbox.apache.org/repos/asf/beam.git')
}
+
// Because git.push() fails to authenticate, run git push directly.
- exec {
- executable 'sh'
- args '-c', "git push website-publish asf-site"
- }
- // Remove the remote. grgit does not have a remote.remove method.
- exec {
- executable 'sh'
- args '-c', "git remote remove website-publish"
- }
+ shell "git fetch website-publish asf-site"
+ shell "git merge website-publish/asf-site --no-edit"
+ shell "git push website-publish asf-site < /dev/null"
Review comment:
I just checked the documentation for `git push` and it can take a URL for
its remote parameter, meaning we can forego all of this remote config
management. Then, the command becomes: `git push
https://gitbox.apache.org/repos/asf/beam.git asf-site` and the rest can be
removed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 149636)
Time Spent: 19h 40m (was: 19.5h)
> Create Jenkins job to push generated HTML to asf-site branch
> ------------------------------------------------------------
>
> Key: BEAM-4496
> URL: https://issues.apache.org/jira/browse/BEAM-4496
> Project: Beam
> Issue Type: Sub-task
> Components: build-system, website
> Reporter: Scott Wegner
> Assignee: Alan Myrvold
> Priority: Major
> Labels: beam-site-automation-reliability
> Fix For: 2.8.0
>
> Time Spent: 19h 40m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
