This is an automated email from the ASF dual-hosted git repository.
bertty pushed a commit to branch docs
in repository https://gitbox.apache.org/repos/asf/incubator-wayang.git
The following commit(s) were added to refs/heads/docs by this push:
new 655e0ec Correction to autodeploy and remove some warnings
655e0ec is described below
commit 655e0ec29fdce5f3b2996481dd13fb75403a9b02
Author: Bertty Contreras-Rojas <[email protected]>
AuthorDate: Sat Apr 17 13:37:45 2021 -0400
Correction to autodeploy and remove some warnings
---
.travis.yml | 11 +-
pom.xml | 1 +
wayang-docs/pom.xml | 135 +++------------------
wayang-docs/src/main/resources/_config.prod.yml | 44 +++++++
.../src/main/resources/_layouts/default.html | 2 +-
5 files changed, 75 insertions(+), 118 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 481648f..12d26b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,14 @@ install:
- if [ "${GENERATE_DOCS}" = "true" ] ; then gem install jekyll bundler ; fi
before_script:
+ - echo '<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";' > ~/.m2/settings.xml
+ - echo 'xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd";>' >> ~/.m2/settings.xml
+ - echo ' <server>' >> ~/.m2/settings.xml
+ - echo ' <id>github</id>' >> ~/.m2/settings.xml
+ - echo " <username>${USER}</username>" >> ~/.m2/settings.xml
+ - echo " <password>${TOKEN}</password>" >> ~/.m2/settings.xml
+ - echo ' </server>' >> ~/.m2/settings.xml
+ - echo '</settings>' >> ~/.m2/settings.xml
- mkdir -p travis/tmp
- echo "#" >> travis/wayang.properties
- echo "# Licensed to the Apache Software Foundation (ASF) under one or
more" >> travis/wayang.properties
@@ -73,7 +81,6 @@ before_script:
- rm -rf result.log || echo "file doesn't exist"
- export LOG_LEVEL=error
- mvn_opts=("-Dorg.slf4j.simpleLogger.defaultLogLevel=${LOG_LEVEL}"
"-Dwayang.configuration=file://$(pwd)/travis/wayang.properties"
"-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=${LOG_LEVEL}"
"-Dlog4j.rootLogger=${LOG_LEVEL}")
- - if [ "${GENERATE_DOCS}" = "true" ] ; then mvn_opts=(${mvn_opts[@]}
"-Pweb-documentation") ; fi
# - chmod +x ./docs/script/cibuild
script:
#- jdk_switcher use openjdk8
@@ -83,7 +90,7 @@ script:
after_success:
# generate the documentation and create a update of the documentation if
something change there
- - if [ "${GENERATE_DOCS}" = "true" ] ; then mvn
gem:exec@generate-documentation gem:exec@generate-documentation-as-latest
site:site -pl wayang-docs -Pweb-documentation ; fi
+ - if [ "${GENERATE_DOCS}" = "true" ] ; then mvn clean
gem:exec@bundle-install gem:exec@generate-documentation
gem:exec@generate-documentation-as-latest site -pl wayang-docs
-Pweb-documentation ; fi
env:
global:
diff --git a/pom.xml b/pom.xml
index 73d3bde..3892794 100644
--- a/pom.xml
+++ b/pom.xml
@@ -877,6 +877,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<!-- Do some pre-build checks and report any findings to
the user -->
<execution>
diff --git a/wayang-docs/pom.xml b/wayang-docs/pom.xml
index 52e59b1..12d680c 100644
--- a/wayang-docs/pom.xml
+++ b/wayang-docs/pom.xml
@@ -60,7 +60,7 @@
<phase>generate-resources</phase>
<configuration>
<file>${env.GEM_HOME}/bin/jekyll</file>
- <execArgs>build --trace --source
${project.basedir}/src/main/resources --destination
${project.build.outputDirectory}/site/website/docs/${project.version}</execArgs>
+ <execArgs>build --trace --source
${project.basedir}/src/main/resources --destination
${project.build.outputDirectory}/site/website/docs/${project.version} --baseurl
/docs/${project.version}/ --config
src/main/resources/_config.prod.yml</execArgs>
</configuration>
</execution>
<execution>
@@ -71,7 +71,7 @@
<phase>generate-resources</phase>
<configuration>
<file>${env.GEM_HOME}/bin/jekyll</file>
- <execArgs>build --trace --source
${project.basedir}/src/main/resources --destination
${project.build.outputDirectory}/site/website/docs/latest</execArgs>
+ <execArgs>build --trace --source
${project.basedir}/src/main/resources --destination
${project.build.outputDirectory}/site/website/docs/latest --baseurl
/docs/latest/ --config src/main/resources/_config.prod.yml</execArgs>
</configuration>
</execution>
<execution>
@@ -97,6 +97,23 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ <executions>
+ <execution>
+ <id>timestamp-property</id>
+ <goals>
+ <goal>timestamp-property</goal>
+ </goals>
+ <configuration>
+ <name>current.time</name>
+ <pattern>yyyy/MM/dd-HH:mm:ss</pattern>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
@@ -105,7 +122,7 @@
<repositoryOwner>apache</repositoryOwner>
<repositoryName>incubator-wayang-website</repositoryName>
<branch>refs/heads/asf-site</branch>
- <message>Creating site for ${project.version}</message>
+ <message>Creating site for ${project.version} at
${current.time}</message>
<outputDirectory>${project.build.outputDirectory}/site/website</outputDirectory>
<includes>
<include>**/*</include>
@@ -146,117 +163,5 @@
</snapshots>
</repository>
</repositories>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>jekyll</artifactId>
- <version>3.1.2</version>
- <type>gem</type>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>liquid</artifactId>
- <type>gem</type>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>kramdown</artifactId>
- <type>gem</type>
- <version>1.10.0</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>mercenary</artifactId>
- <type>gem</type>
- <version>0.3.5</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>safe_yaml</artifactId>
- <type>gem</type>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>colorator</artifactId>
- <type>gem</type>
- <version>0.1</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>rouge</artifactId>
- <type>gem</type>
- <version>1.10.1</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>jekyll-sass-converter</artifactId>
- <type>gem</type>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>sass</artifactId>
- <type>gem</type>
- <version>3.4.22</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>jekyll-watch</artifactId>
- <type>gem</type>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>listen</artifactId>
- <type>gem</type>
- <version>3.0.6</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>rb-fsevent</artifactId>
- <type>gem</type>
- <version>0.9.7</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>rb-inotify</artifactId>
- <type>gem</type>
- <version>0.9.7</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>ffi</artifactId>
- <type>gem</type>
- <version>1.9.10</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>celluloid-essentials</artifactId>
- <version>0.20.5</version>
- <type>gem</type>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>celluloid-supervision</artifactId>
- <type>gem</type>
- <version>0.20.5</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>yajl-ruby</artifactId>
- <type>gem</type>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>rubygems</groupId>
- <artifactId>bundler</artifactId>
- <type>gem</type>
- <version>1.11.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
diff --git a/wayang-docs/src/main/resources/_config.prod.yml
b/wayang-docs/src/main/resources/_config.prod.yml
new file mode 100644
index 0000000..dea24c8
--- /dev/null
+++ b/wayang-docs/src/main/resources/_config.prod.yml
@@ -0,0 +1,44 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+url: "https://wayang.apache.org";
+baseurl: ""
+title: "Apache Wayang - Documentation"
+permalink: pretty
+collections:
+ publications:
+ output: true
+asciidoc: {}
+asciidoctor:
+ base_dir: :docdir
+ safe: unsafe
+ attributes:
+ - idseparator=_
+ - source-highlighter=coderay
+ - icons=font
+compress_html:
+ clippings: all
+ comments: ["<!-- ", " -->"]
+ endings: all
+ ignore:
+ envs: [local]
+ blanklines: false
+ profile: true
+ startings: [html, head, body]
+plugins:
+ - jekyll-menus
+exclude: ['README.md', 'Gemfile.lock', 'Gemfile']
diff --git a/wayang-docs/src/main/resources/_layouts/default.html
b/wayang-docs/src/main/resources/_layouts/default.html
index e3b1e48..e20dfe8 100644
--- a/wayang-docs/src/main/resources/_layouts/default.html
+++ b/wayang-docs/src/main/resources/_layouts/default.html
@@ -40,7 +40,7 @@
<div class="row flex-xl-nowrap">
<div class="col-md-3 col-xl-2 bd-sidebar pt-3 px-0" style="min-height:
95vh; border-right: solid 1px #a00e5a; background-color: #F5F7F9">
<ul id="main-menu" class="nav flex-column nav-pills">
- {% for item in site.menus.header | sort:weight %}
+ {% for item in site.menus.header %}
{%- include sub-menu.html -%}
{% endfor %}
