This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/main by this push:
new 608e1f3b YETUS-1163. Remove changelog data from config.rb (#260)
608e1f3b is described below
commit 608e1f3bc62fc7951e39e21dea63cdc5e0449e77
Author: Allen Wittenauer <[email protected]>
AuthorDate: Tue Apr 26 08:03:01 2022 -0700
YETUS-1163. Remove changelog data from config.rb (#260)
---
asf-site-src/config.rb | 39 ++-----------------------
asf-site-src/source/downloads/index.html.md.erb | 4 +--
2 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/asf-site-src/config.rb b/asf-site-src/config.rb
index 02727c4c..646d80ce 100644
--- a/asf-site-src/config.rb
+++ b/asf-site-src/config.rb
@@ -100,34 +100,14 @@ def shelldocs(output, docs = [])
end
end
-RELEASEDOCMAKER =
File.absolute_path('../releasedocmaker/src/main/python/releasedocmaker.py')
-
-def releasenotes(output, version)
- # TODO: check jira for last update to the version and compare to source
- # file timestamp
- puts("Calling releasenotes #{version} @ #{output}")
- `(cd #{output} && #{RELEASEDOCMAKER} --project=YETUS --version=#{version} \
- --projecttitle="Apache Yetus" \
- --dirversions --empty \
- --extension=.html.md \
- --usetoday --license --lint=all)`
- errmsg = $stderr
- return if $CHILD_STATUS.exitstatus.zero?
-
- puts(errmsg)
- abort("releasedocmaker failed to generate release notes for #{version}.")
-end
-
-def build_release_docs(output, version)
- puts "Building docs for release #{version}"
-
+def fetch_release_docs(output, version)
puts "Downloading and extracting #{version} from ASF archives"
`(cd #{output} \
&& mkdir -p site/documentation/#{version} \
&& curl --fail --location --output site-#{version}.tar.gz \
https://archive.apache.org/dist/yetus/#{version}/apache-yetus-#{version}-site.tar.gz
\
&& tar -C site/documentation/#{version} \
- --strip-components 3 -xzkpf site-#{version}.tar.gz \
+ --strip-components 3 -xzpf site-#{version}.tar.gz \
apache-yetus-#{version}-site/documentation/in-progress/ \
)`
end
@@ -164,19 +144,6 @@ after_configuration do
# instead of symlinks
FileUtils.mkdir_p 'target/in-progress/precommit/apidocs/'
precommit_shelldocs('target/in-progress/precommit/apidocs/',
'../precommit/src/main/shell')
- # stitch the javadoc in place
- app.data.versions.releases&.each do |release|
- releasenotes('target', release)
- sitemap.register_resource_list_manipulator(
- "#{release}_javadocs".to_sym,
- ApiDocs.new(
- sitemap,
- "documentation/#{release}",
- File.expand_path("target/build-#{release}",
- File.dirname(__FILE__))
- )
- )
- end
end
after_build do
@@ -186,6 +153,6 @@ after_build do
'target/site/documentation/in-progress/precommit/apidocs/index.html'
)
app.data.versions.releases&.each do |release|
- build_release_docs('target', release)
+ fetch_release_docs('target', release)
end
end
diff --git a/asf-site-src/source/downloads/index.html.md.erb
b/asf-site-src/source/downloads/index.html.md.erb
index 2def1b59..9ddf7e92 100644
--- a/asf-site-src/source/downloads/index.html.md.erb
+++ b/asf-site-src/source/downloads/index.html.md.erb
@@ -37,8 +37,8 @@ third-party repositories (e.g. Maven Central) and [Docker
Hub](../yetus-docker-i
<% data.versions.releases.reverse.each do | release | %>
* <%= release %>
- * [Release Notes](/documentation/<%= release %>/RELEASENOTES)
- * [CHANGELOG](/documentation/<%= release %>/CHANGELOG)
+ * [Release Notes](releasenotes/<%= release %>/RELEASENOTES.<%= release %>/)
+ * [CHANGELOG](releasenotes/<%= release %>/CHANGELOG.<%= release %>/)
<% if release =~ /^0\.[0-8]\./ %>
* Source : [yetus-<%= release
%>-src.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release
%>/yetus-<%= release %>-src.tar.gz)
([signature](https://downloads.apache.org/yetus/<%= release %>/yetus-<%=
release %>-src.tar.gz.asc), [hashes](https://downloads.apache.org/yetus/<%=
release %>/yetus-<%= release %>-src.tar.gz.mds))
* Binaries : [yetus-<%= release
%>-bin.tar.gz](https://www.apache.org/dyn/closer.lua?path=/yetus/<%= release
%>/yetus-<%= release %>-bin.tar.gz)
([signature](https://downloads.apache.org/yetus/<%= release %>/yetus-<%=
release %>-bin.tar.gz.asc), [hashes](https://downloads.apache.org/yetus/<%=
release %>/yetus-<%= release %>-bin.tar.gz.mds))
