You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2018/10/26 18:40:58 UTC
[beam] branch master updated: Update web site links for the 2.8.0
release (#6745)
This is an automated email from the ASF dual-hosted git repository.
altay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 9f161d9 Update web site links for the 2.8.0 release (#6745)
9f161d9 is described below
commit 9f161d9fc5b4766b4057e10dda2364cfac73ede0
Author: Ahmet Altay <aa...@gmail.com>
AuthorDate: Fri Oct 26 11:40:50 2018 -0700
Update web site links for the 2.8.0 release (#6745)
* Update web site links for the 2.8.0 release
---
.../src/main/scripts/build_release_candidate.sh | 24 +++++++++-------------
website/.gitignore | 1 +
website/_config.yml | 2 +-
website/src/.htaccess | 2 +-
website/src/contribute/release-guide.md | 2 +-
website/src/get-started/downloads.md | 7 +++++++
6 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/release/src/main/scripts/build_release_candidate.sh b/release/src/main/scripts/build_release_candidate.sh
index 37941d7..9319409 100755
--- a/release/src/main/scripts/build_release_candidate.sh
+++ b/release/src/main/scripts/build_release_candidate.sh
@@ -89,6 +89,7 @@ if [[ $confirmation = "y" ]]; then
git clone ${GIT_REPO_URL}
cd ${BEAM_ROOT_DIR}
git checkout ${RELEASE_BRANCH}
+ RELEASE_COMMIT=$(git rev-parse --verify ${RELEASE_BRANCH})
echo "-------------Building Java Artifacts with Gradle-------------"
git config credential.helper store
@@ -103,7 +104,7 @@ if [[ $confirmation = "y" ]]; then
echo "-------------Staging Java Artifacts into Maven---------------"
./gradlew publish -PisRelease --no-parallel --no-daemon
- echo "Please review all artifacts in https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.beam%22"
+ echo "Please review all artifacts in staging URL. e.g. https://repository.apache.org/content/repositories/orgapachebeam-NNNN/"
rm -rf ~/${LOCAL_CLONE_DIR}
fi
@@ -215,6 +216,7 @@ if [[ $confirmation = "y" ]]; then
git checkout ${RELEASE_BRANCH}
cd sdks/python && tox -e docs
GENERATED_PYDOC=~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_PYTHON_DOC}/${BEAM_ROOT_DIR}/sdks/python/target/docs/_build
+ rm -rf ${GENERATED_PYDOC}/.doctrees
echo "----------------------Building Java Doc----------------------"
cd ~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_JAVA_DOC}
@@ -224,27 +226,21 @@ if [[ $confirmation = "y" ]]; then
./gradlew :beam-sdks-java-javadoc:aggregateJavadoc
GENERATE_JAVADOC=~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_JAVA_DOC}/${BEAM_ROOT_DIR}/sdks/java/javadoc/build/docs/javadoc/
- echo "------------------Updating Beam Website---------------------"
+ echo "------------------Updating Release Docs---------------------"
cd ~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_WEBSITE_REPO}
git clone ${GIT_BEAM_WEBSITE}
cd ${WEBSITE_ROOT_DIR}
- git checkout -b updates_release_${RELEASE}
-
- echo "..........Updating release version in _config.yml..........."
- sed -i -e "s/release_latest: [0-9].[0-9].[0-9]/release_latest: ${RELEASE}/g" _config.yml
+ git checkout release-docs
+ git checkout -b updates_release_${RELEASE} release-docs
echo "..........Copying generated javadoc into beam-site.........."
- cp -r ${GENERATE_JAVADOC} src/documentation/sdks/javadoc/${RELEASE}
- echo "Updating javadoc current.md with latest release version number"
- sed -i -e "s/[0-9].[0-9].[0-9]/${RELEASE}/g" src/documentation/sdks/javadoc/current.md
+ cp -r ${GENERATE_JAVADOC} javadoc/${RELEASE}
echo "............Copying generated pydoc into beam-site.........."
- cp -r ${GENERATED_PYDOC} src/documentation/sdks/pydoc/${RELEASE}
- echo ".....Updating pydoc current.md with latest release version number......"
- sed -i -e "s/[0-9].[0-9].[0-9]/${RELEASE}/g" src/documentation/sdks/pydoc/current.md
+ cp -r ${GENERATED_PYDOC} pydoc/${RELEASE}
git add -A
- git commit -m "Update beam-site for release ${RELEASE}"
+ git commit -m "Update beam-site for release ${RELEASE}\n\nContent generated based on commit ${RELEASE_COMMIT}"
git push ${USER_REMOTE_URL}
if [[ -z `which hub` ]]; then
@@ -261,7 +257,7 @@ if [[ $confirmation = "y" ]]; then
fi
fi
if [[ -z `which hub` ]]; then
- hub pull-request -m "Publish ${RELEASE} release" -h ${USER_GITHUB_ID}:updates_release_${RELEASE} -b apache:asf-site
+ hub pull-request -m "Publish ${RELEASE} release" -h ${USER_GITHUB_ID}:updates_release_${RELEASE} -b apache:release-docs
else
echo "Without hub, you need to create PR manually."
fi
diff --git a/website/.gitignore b/website/.gitignore
index 072e28b..76451ba 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -1,4 +1,5 @@
_site
+.doctrees
.sass-cache
.jekyll-metadata
vendor/
diff --git a/website/_config.yml b/website/_config.yml
index d5827ba..6297647 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -56,7 +56,7 @@ kramdown:
toc_levels: 2..6
# The most recent release of Beam.
-release_latest: 2.7.0
+release_latest: 2.8.0
# Plugins are configured in the Gemfile.
diff --git a/website/src/.htaccess b/website/src/.htaccess
index 2462791..5f00051 100644
--- a/website/src/.htaccess
+++ b/website/src/.htaccess
@@ -21,4 +21,4 @@ RewriteRule ^(.*)$ https://beam.apache.org/$1 [L,R=301]
# The following redirect maintains the previously supported URLs.
RedirectMatch permanent "/documentation/sdks/(javadoc|pydoc)(.*)" "https://beam.apache.org/releases/$1$2"
# Keep this updated to point to the current release.
-RedirectMatch "/releases/([^/]+)/current(.*)" "https://beam.apache.org/releases/$1/2.7.0$2"
+RedirectMatch "/releases/([^/]+)/current(.*)" "https://beam.apache.org/releases/$1/2.8.0$2"
diff --git a/website/src/contribute/release-guide.md b/website/src/contribute/release-guide.md
index 66f2590..d3266ab 100644
--- a/website/src/contribute/release-guide.md
+++ b/website/src/contribute/release-guide.md
@@ -618,7 +618,7 @@ If you are interested in how it works, please refer to the [structure section](h
Please follow the [user guide](https://github.com/apache/beam-wheels#user-guide) to build python wheels.
Once all python wheels have been staged [dist.apache.org](https://dist.apache.org/repos/dist/dev/beam/),
-please run ./sign_hash_python_wheels.sh to sign and hash python wheels.
+please run [./sign_hash_python_wheels.sh](https://github.com/apache/beam/blob/master/release/src/main/scripts/sign_hash_python_wheels.sh) to sign and hash python wheels.
#### Checklist to proceed to the next step
diff --git a/website/src/get-started/downloads.md b/website/src/get-started/downloads.md
index 7419dfa..bf5c478 100644
--- a/website/src/get-started/downloads.md
+++ b/website/src/get-started/downloads.md
@@ -90,6 +90,13 @@ versions denoted `0.x.y`.
## Releases
+### 2.8.0 (2018-10-26)
+Official [source code download](http://www.apache.org/dyn/closer.cgi/beam/2.8.0/apache-beam-2.8.0-source-release.zip).
+[SHA-512](https://www.apache.org/dist/beam/2.8.0/apache-beam-2.8.0-source-release.zip.sha512).
+[signature](https://www.apache.org/dist/beam/2.8.0/apache-beam-2.8.0-source-release.zip.asc).
+
+[Release notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319527&version=12343985).
+
### 2.7.0 (2018-10-02)
Official [source code download](http://www.apache.org/dyn/closer.cgi/beam/2.7.0/apache-beam-2.7.0-source-release.zip).
[SHA-512](https://www.apache.org/dist/beam/2.7.0/apache-beam-2.7.0-source-release.zip.sha512).