[
https://issues.apache.org/jira/browse/BEAM-4496?focusedWorklogId=150286&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-150286
]
ASF GitHub Bot logged work on BEAM-4496:
----------------------------------------
Author: ASF GitHub Bot
Created on: 02/Oct/18 02:28
Start Date: 02/Oct/18 02:28
Worklog Time Spent: 10m
Work Description: swegner closed pull request #6531: [BEAM-4496] Fix #2
for branch fetch failure on job_PostCommit_Website_Publish
URL: https://github.com/apache/beam/pull/6531
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/website/build.gradle b/website/build.gradle
index a73628d0184..fd9c55a667c 100644
--- a/website/build.gradle
+++ b/website/build.gradle
@@ -28,6 +28,7 @@ def buildDir = "${project.rootDir}/build/website"
def buildContentDir = "${project.rootDir}/build/website/generated-content"
def repoContentDir = "${project.rootDir}/website/generated-content"
def commitedChanges = false
+def gitboxUrl = project.findProperty('gitPublishRemote') ?:
'https://gitbox.apache.org/repos/asf/beam.git'
def shell = { cmd ->
println cmd
@@ -125,7 +126,7 @@ task commitWebsite << {
// get the latest commit on master
def latestCommit = grgit.log(maxCommits: 1)[0].abbreviatedId
- shell "git fetch origin asf-site"
+ shell "git fetch ${gitboxUrl} asf-site"
git.checkout(branch: 'asf-site')
shell "git reset --hard origin/asf-site"
@@ -178,7 +179,7 @@ task publishWebsite << {
}
// Because git.push() fails to authenticate, run git push directly.
- shell "git push https://gitbox.apache.org/repos/asf/beam.git asf-site"
+ shell "git push ${gitboxUrl} asf-site"
}
commitWebsite.dependsOn testWebsite
diff --git a/website/src/get-started/downloads.md
b/website/src/get-started/downloads.md
index d9912472f4d..608774f9812 100644
--- a/website/src/get-started/downloads.md
+++ b/website/src/get-started/downloads.md
@@ -80,9 +80,9 @@ versions denoted `0.x.y`.
## Releases
### 2.6.0 (2018-08-08)
-Official [source code
download](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip)
-[SHA-512](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip.sha512)
-[signature](https://dist.apache.org/repos/dist/release/beam/2.6.0/apache-beam-2.6.0-source-release.zip.asc).
+Official [source code
download](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip)
+[SHA-512](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip.sha512)
+[signature](https://archive.apache.org/dist/beam/2.6.0/apache-beam-2.6.0-source-release.zip.asc).
[Release
notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319527&version=12343392).
----------------------------------------------------------------
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: 150286)
Time Spent: 21h 10m (was: 21h)
> 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: 21h 10m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
