Skip to content

Commit

Permalink
[BEAM-4496] Fix apache#2 branch fetch failure on job_PostCommit_Websi…
Browse files Browse the repository at this point in the history
…te_Publish
  • Loading branch information
Alan Myrvold committed Oct 1, 2018
1 parent a9d0d66 commit bbdff1b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .test-infra/jenkins/job_PostCommit_Website_Publish.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import PostcommitJobBuilder


// This job builds and publishes the website into the asf-site branch of the beam repo.
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Website_Publish', '',
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Website_Publish', 'Run Website Publish',
'Website Publish', this) {

description('Publish generated website content into asf-site branch for hosting.')
Expand Down
5 changes: 3 additions & 2 deletions website/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "https://gitbox.apache.org/repos/asf/beam.git"

def shell = { cmd ->
println cmd
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions website/src/get-started/downloads.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down

0 comments on commit bbdff1b

Please sign in to comment.