You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@incubator.apache.org by jm...@apache.org on 2022/09/20 08:01:04 UTC

[incubator] 38/46: chore(website): Cleaned up an unneeded step in the build and made the "presentations" menu open presentations in ne tabs/windows.

This is an automated email from the ASF dual-hosted git repository.

jmclean pushed a commit to branch ApacheConSlides
in repository https://gitbox.apache.org/repos/asf/incubator.git

commit a249299f3996d83c392126fe464037421831038f
Author: Christofer Dutz <ch...@rivian.com>
AuthorDate: Mon Sep 19 16:57:06 2022 +0200

    chore(website): Cleaned up an unneeded step in the build and made the "presentations" menu open presentations in ne tabs/windows.
---
 site/Jenkinsfile       | 17 ++---------------
 site/src/site/site.xml | 36 +++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/site/Jenkinsfile b/site/Jenkinsfile
index 722c983c..54829989 100644
--- a/site/Jenkinsfile
+++ b/site/Jenkinsfile
@@ -95,12 +95,12 @@ pipeline {
             }
         }
 
-        stage('Stage site') {
+        stage('Deploy site') {
 /*            when {
                 changeset "site/**"
             }*/
             steps {
-                echo 'Staging Site'
+                echo 'Deploying Site'
                 // Build a directory containing the aggregated website.
                 sh 'mvn -f site/pom.xml -Pdeploy-site scm-publish:publish-scm'
 
@@ -112,19 +112,6 @@ pipeline {
                 */
             }
         }
-
-        stage('Deploy site') {
-            when {
-                //changeset "site/**"
-                //branch 'master'
-                branch 'develop'
-            }
-            steps {
-                echo 'Deploying Site'
-                // Publish the site with the scm-publish plugin.
-                sh 'mvn -f site/pom.xml scm-publish:publish-scm'
-            }
-        }
     }
 
     // Send out notifications on unsuccessful builds.
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
index 2852480f..efe119a2 100644
--- a/site/src/site/site.xml
+++ b/site/src/site/site.xml
@@ -17,7 +17,9 @@
  limitations under the License.
  
  -->
-<project name="Training">
+<project name="Training" xmlns="http://maven.apache.org/DECORATION/1.6.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd">
 
   <skin>
     <groupId>io.github.devacfr.maven.skins</groupId>
@@ -107,30 +109,30 @@
       <item name="Getting Started" href="users/index.html"/>
     </menu>
     <menu name="Presentations">
-      <item name="Apache Airflow" href="presentations/airflow/index.html"/>
+      <item name="Apache Airflow" href="presentations/airflow/index.html" target="_blank"/>
       <item name="Apache ComDev">
-        <item name="Intro" href="presentations/comdev/comdev-intro/index.html"/>
+        <item name="Intro" href="presentations/comdev/comdev-intro/index.html" target="_blank"/>
       </item>
-      <item name="Apache Druid" href="presentations/druid/index.html"/>
-      <item name="Apache Flink" href="presentations/flink/index.html"/>
-      <item name="Apache Hadoop" href="presentations/hadoop/index.html"/>
-      <item name="Apache Hive" href="presentations/hive/index.html"/>
-      <item name="Apache Ignite" href="presentations/ignite/index.html"/>
+      <item name="Apache Druid" href="presentations/druid/index.html" target="_blank"/>
+      <item name="Apache Flink" href="presentations/flink/index.html" target="_blank"/>
+      <item name="Apache Hadoop" href="presentations/hadoop/index.html" target="_blank"/>
+      <item name="Apache Hive" href="presentations/hive/index.html" target="_blank"/>
+      <item name="Apache Ignite" href="presentations/ignite/index.html" target="_blank"/>
       <item name="Apache Incubator">
-        <item name="Incubator Releases" href="presentations/incubator/incubator-releases/index.html"/>
-        <item name="Navigating ASF Incubator" href="presentations/incubator/navigating-asf-incubation/index.html"/>
-        <item name="Release Checklist" href="presentations/incubator/release-checklist/index.html"/>
+        <item name="Incubator Releases" href="presentations/incubator/incubator-releases/index.html" target="_blank"/>
+        <item name="Navigating ASF Incubator" href="presentations/incubator/navigating-asf-incubation/index.html" target="_blank"/>
+        <item name="Release Checklist" href="presentations/incubator/release-checklist/index.html" target="_blank"/>
       </item>
-      <item name="Apache MyNewt" href="presentations/mynewt/index.html"/>
-      <item name="Apache Pulsar" href="presentations/pulsar/index.html"/>
-      <item name="Apache Samza" href="presentations/samza/index.html"/>
+      <item name="Apache MyNewt" href="presentations/mynewt/index.html" target="_blank"/>
+      <item name="Apache Pulsar" href="presentations/pulsar/index.html" target="_blank"/>
+      <item name="Apache Samza" href="presentations/samza/index.html" target="_blank"/>
       <item name="Apache Spark">
-        <item name="Basics" href="presentations/spark/basics/index.html"/>
+        <item name="Basics" href="presentations/spark/basics/index.html" target="_blank"/>
       </item>
       <item name="Apache Training">
-        <item name="Presentation" href="presentations/training/presentation/index_en.html"/>
+        <item name="Presentation" href="presentations/training/presentation/index_en.html" target="_blank"/>
       </item>
-      <item name="Apache Zookeeper" href="presentations/zokeeper/index.html"/>
+      <item name="Apache Zookeeper" href="presentations/zokeeper/index.html" target="_blank"/>
     </menu>
     <menu name="Developers">
       <item name="Bug &amp; Issue Tracker" href="developers/issues.html"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org