Merge branch 'current' into issue-4192

mnriem · Nov 20, 2024 · f861855 · f861855
2 parents 8068244 + 1cee15b
commit f861855
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -26,10 +26,10 @@ jobs:
         java-version: 21
     - name: Build with Maven
       run: |
-        mvn -B -DskipTests -DskipITs -ntp -T 1 install site
+        mvn -B -DskipTests -DskipITs -DstagingDirectory=$PWD/target/staging -ntp -T 1 install site site:stage
         rm -rf piranha-website/snapshot || true
         mkdir -p piranha-website/snapshot || true
-        cp -R target/site/* piranha-website/snapshot/
+        cp -R target/staging/* piranha-website/snapshot/
         cd piranha-website
         git config --global user.email "[email protected]"
         git config --global user.name "Automated publish"

diff --git a/dist/coreprofile/src/site/site.xml b/dist/coreprofile/src/site/site.xml
@@ -7,6 +7,8 @@
     <body>
         <menu name="Core Profile">
             <item name="Introduction" href="index.html"/>
+        </menu>
+        <menu name="Guides">
             <item name="Create a REST service" href="create_a_rest_service.html"/>
             <item name="Create a JSON REST service" href="create_a_json_rest_service.html"/>
             <item name="Debugging a REST service with NetBeans" href="debugging_a_rest_service_with_netbeans.html"/>

diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
@@ -28,11 +28,11 @@ distribution supports see our [Jakarta EE / Micro Profile matrix](https://piranh
 
 ## Distribution specific documentation
 
-* [Piranha Core Profile](coreprofile/index.html)
-* [Piranha Embedded](embedded/index.html)
-* [Piranha Servlet](servlet/index.html)
-* [Piranha Server](server/index.html)
-* [Piranha Web Profile](webprofile/index.html)
+* [Piranha Core Profile](dist/coreprofile/index.html)
+* [Piranha Embedded](dist/embedded/index.html)
+* [Piranha Servlet](dist/servlet/index.html)
+* [Piranha Server](dist/server/index.html)
+* [Piranha Web Profile](dist/webprofile/index.html)
 
 ## Maven Plugin documentation