Skip to content

[BEAM-4496] Fix #2 for branch fetch failure on job_PostCommit_Website_Publish #6531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swegner merged 3 commits into from
Oct 2, 2018
Merged

[BEAM-4496] Fix #2 for branch fetch failure on job_PostCommit_Website_Publish #6531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
035b53d
[BEAM-4496] Fix #2 branch fetch failure on job_PostCommit_Website_Pub…
Sep 27, 2018
793f013
fixup! Read publish remote from command-line property
swegner Oct 1, 2018
b82f194
Merge pull request #3 from swegner/website_branch_fail
alanmyrvold Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions website/build.gradle
View file
Open in desktop
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 = project.findProperty('gitPublishRemote') ?: '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
View file
Open in desktop
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