Skip to content

Commit 9f161d9

Browse files
authored
Update web site links for the 2.8.0 release (apache#6745)
* Update web site links for the 2.8.0 release
1 parent 2307556 commit 9f161d9

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

release/src/main/scripts/build_release_candidate.sh

+10-14
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ if [[ $confirmation = "y" ]]; then
8989
git clone ${GIT_REPO_URL}
9090
cd ${BEAM_ROOT_DIR}
9191
git checkout ${RELEASE_BRANCH}
92+
RELEASE_COMMIT=$(git rev-parse --verify ${RELEASE_BRANCH})
9293

9394
echo "-------------Building Java Artifacts with Gradle-------------"
9495
git config credential.helper store
@@ -103,7 +104,7 @@ if [[ $confirmation = "y" ]]; then
103104

104105
echo "-------------Staging Java Artifacts into Maven---------------"
105106
./gradlew publish -PisRelease --no-parallel --no-daemon
106-
echo "Please review all artifacts in https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.beam%22"
107+
echo "Please review all artifacts in staging URL. e.g. https://repository.apache.org/content/repositories/orgapachebeam-NNNN/"
107108
rm -rf ~/${LOCAL_CLONE_DIR}
108109
fi
109110

@@ -215,6 +216,7 @@ if [[ $confirmation = "y" ]]; then
215216
git checkout ${RELEASE_BRANCH}
216217
cd sdks/python && tox -e docs
217218
GENERATED_PYDOC=~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_PYTHON_DOC}/${BEAM_ROOT_DIR}/sdks/python/target/docs/_build
219+
rm -rf ${GENERATED_PYDOC}/.doctrees
218220

219221
echo "----------------------Building Java Doc----------------------"
220222
cd ~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_JAVA_DOC}
@@ -224,27 +226,21 @@ if [[ $confirmation = "y" ]]; then
224226
./gradlew :beam-sdks-java-javadoc:aggregateJavadoc
225227
GENERATE_JAVADOC=~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_JAVA_DOC}/${BEAM_ROOT_DIR}/sdks/java/javadoc/build/docs/javadoc/
226228

227-
echo "------------------Updating Beam Website---------------------"
229+
echo "------------------Updating Release Docs---------------------"
228230
cd ~/${LOCAL_WEBSITE_UPDATE_DIR}/${LOCAL_WEBSITE_REPO}
229231
git clone ${GIT_BEAM_WEBSITE}
230232
cd ${WEBSITE_ROOT_DIR}
231-
git checkout -b updates_release_${RELEASE}
232-
233-
echo "..........Updating release version in _config.yml..........."
234-
sed -i -e "s/release_latest: [0-9].[0-9].[0-9]/release_latest: ${RELEASE}/g" _config.yml
233+
git checkout release-docs
234+
git checkout -b updates_release_${RELEASE} release-docs
235235

236236
echo "..........Copying generated javadoc into beam-site.........."
237-
cp -r ${GENERATE_JAVADOC} src/documentation/sdks/javadoc/${RELEASE}
238-
echo "Updating javadoc current.md with latest release version number"
239-
sed -i -e "s/[0-9].[0-9].[0-9]/${RELEASE}/g" src/documentation/sdks/javadoc/current.md
237+
cp -r ${GENERATE_JAVADOC} javadoc/${RELEASE}
240238

241239
echo "............Copying generated pydoc into beam-site.........."
242-
cp -r ${GENERATED_PYDOC} src/documentation/sdks/pydoc/${RELEASE}
243-
echo ".....Updating pydoc current.md with latest release version number......"
244-
sed -i -e "s/[0-9].[0-9].[0-9]/${RELEASE}/g" src/documentation/sdks/pydoc/current.md
240+
cp -r ${GENERATED_PYDOC} pydoc/${RELEASE}
245241

246242
git add -A
247-
git commit -m "Update beam-site for release ${RELEASE}"
243+
git commit -m "Update beam-site for release ${RELEASE}\n\nContent generated based on commit ${RELEASE_COMMIT}"
248244
git push ${USER_REMOTE_URL}
249245

250246
if [[ -z `which hub` ]]; then
@@ -261,7 +257,7 @@ if [[ $confirmation = "y" ]]; then
261257
fi
262258
fi
263259
if [[ -z `which hub` ]]; then
264-
hub pull-request -m "Publish ${RELEASE} release" -h ${USER_GITHUB_ID}:updates_release_${RELEASE} -b apache:asf-site
260+
hub pull-request -m "Publish ${RELEASE} release" -h ${USER_GITHUB_ID}:updates_release_${RELEASE} -b apache:release-docs
265261
else
266262
echo "Without hub, you need to create PR manually."
267263
fi

website/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
_site
2+
.doctrees
23
.sass-cache
34
.jekyll-metadata
45
vendor/

website/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ kramdown:
5656
toc_levels: 2..6
5757

5858
# The most recent release of Beam.
59-
release_latest: 2.7.0
59+
release_latest: 2.8.0
6060

6161
# Plugins are configured in the Gemfile.
6262

website/src/.htaccess

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ RewriteRule ^(.*)$ https://beam.apache.org/$1 [L,R=301]
2121
# The following redirect maintains the previously supported URLs.
2222
RedirectMatch permanent "/documentation/sdks/(javadoc|pydoc)(.*)" "https://beam.apache.org/releases/$1$2"
2323
# Keep this updated to point to the current release.
24-
RedirectMatch "/releases/([^/]+)/current(.*)" "https://beam.apache.org/releases/$1/2.7.0$2"
24+
RedirectMatch "/releases/([^/]+)/current(.*)" "https://beam.apache.org/releases/$1/2.8.0$2"

website/src/contribute/release-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ If you are interested in how it works, please refer to the [structure section](h
618618
Please follow the [user guide](https://github.com/apache/beam-wheels#user-guide) to build python wheels.
619619
620620
Once all python wheels have been staged [dist.apache.org](https://dist.apache.org/repos/dist/dev/beam/),
621-
please run ./sign_hash_python_wheels.sh to sign and hash python wheels.
621+
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.
622622
623623
#### Checklist to proceed to the next step
624624

website/src/get-started/downloads.md

+7
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ versions denoted `0.x.y`.
9090

9191
## Releases
9292

93+
### 2.8.0 (2018-10-26)
94+
Official [source code download](http://www.apache.org/dyn/closer.cgi/beam/2.8.0/apache-beam-2.8.0-source-release.zip).
95+
[SHA-512](https://www.apache.org/dist/beam/2.8.0/apache-beam-2.8.0-source-release.zip.sha512).
96+
[signature](https://www.apache.org/dist/beam/2.8.0/apache-beam-2.8.0-source-release.zip.asc).
97+
98+
[Release notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12319527&version=12343985).
99+
93100
### 2.7.0 (2018-10-02)
94101
Official [source code download](http://www.apache.org/dyn/closer.cgi/beam/2.7.0/apache-beam-2.7.0-source-release.zip).
95102
[SHA-512](https://www.apache.org/dist/beam/2.7.0/apache-beam-2.7.0-source-release.zip.sha512).

0 commit comments

Comments
 (0)