update javadoc.yml and ManualJavadocsDeploy.sh

Author: leerho

.github/workflows/javadoc.yml

@@ -34,12 +34,14 @@ jobs:
           cache: 'maven'
 
       - name: Build and Generate Javadoc  # POM is configured to output to target/site/apidocs
-        run: mvn javadoc:javadoc
+        run: mvn clean javadoc:javadoc
 
       - name: Deploy Javadoc via Worktree
         env:
           TAG_NAME: ${{ github.event.inputs.tag_ref }}
         run: |
+          if [ -z "$TAG_NAME" ]; then echo "ERROR: No tag specified"; exit 1; fi
+          
           # 1. Initialize error tracking
           EXIT_CODE=0
           
@@ -48,42 +50,48 @@ jobs:
           git config user.name "github-actions[bot]"
           
           # 3. Ensure gh-pages exists and is fetched
-          echo "git fetch origin gh-pages"
+          echo "ECHO: git fetch origin gh-pages"
           git fetch origin gh-pages
           
           # 4. Create worktree for the gh-pages branch in a separate folder
-          echo "git worktree add ./gh-pages-dir origin/gh-pages"
-          git worktree add ./gh-pages-dir origin/gh-pages
+          echo "ECHO: git worktree add -B gh-pages ./gh-pages-dir origin/gh-pages"
+          git worktree add -B gh-pages ./gh-pages-dir origin/gh-pages
           
           # 5. Deployment Logic in a subshell to capture exit code
           (
             set -e
             TARGET_PATH="gh-pages-dir/docs/$TAG_NAME"
             mkdir -p "$TARGET_PATH"
-            echo "cp -a target/site/apidocs/. $TARGET_PATH/"
+            
+            echo "ECHO: cp -a target/site/apidocs/. $TARGET_PATH/"
             cp -a target/site/apidocs/. "$TARGET_PATH/"
             cd gh-pages-dir
+            
+            echo "ECHO: git pull origin gh-pages --rebase"
+            git pull origin gh-pages --rebase
+            
             echo "git add docs/$TAG_NAME"
             git add "docs/$TAG_NAME"
             
             if git diff --staged --quiet; then
               echo "No changes detected for Javadoc $TAG_NAME."
             else
-              echo "Changes detected for Javadoc $TAG_NAME."
-              echo "git commit ..."
+              echo "ECHO: Changes detected for Javadoc $TAG_NAME."
+              echo "ECHO: git commit ..."
               git commit -m "Manual Javadoc deployment for tag $TAG_NAME"
-              echo "git push origin gh-pages"
+              echo "ECHO: git push origin gh-pages"
               git push origin gh-pages
             fi
           ) || EXIT_CODE=$?
           
           # 6. Cleanup (Always runs)
-          echo "Cleaning up worktree..."
+          echo "ECHO: Cleaning up worktree..."
           git worktree remove --force ./gh-pages-dir || true
           
           # 7. Final exit based on subshell success
           exit $EXIT_CODE
 
       - name: Confirm Deployment
         if: success()
-        run: echo "Javadoc for ${{ github.event.inputs.tag_ref }} is now live on gh-pages."
+        run: echo "ECHO: Javadoc for ${{ github.event.inputs.tag_ref }} is now live on gh-pages."
+

tools/ManualJavadocsDeploy.sh

@@ -19,8 +19,10 @@ EXIT_CODE=0
   mkdir -p "$TARGET_PATH"
   cp -a target/site/apidocs/. "$TARGET_PATH/"
   cd gh-pages-dir
+  
   echo "ECHO: git pull origin gh-pages --rebase"
   git pull origin gh-pages --rebase
+
   echo "ECHO: git add docs/$TAG_NAME"
   git add "docs/$TAG_NAME"
 
@@ -41,7 +43,12 @@ EXIT_CODE=0
 echo "ECHO: Cleaning up worktree..."
 git worktree remove --force ./gh-pages-dir || true
 
-# Final exit based on subshell success
-exit $EXIT_CODE
-if: success()
-run: echo "ECHO: Javadoc for $TAG_NAME is now live on gh-pages."
+# Check the exit code and report success or failure
+if [ $EXIT_CODE -eq 0 ]; then
+  echo "ECHO: Javadoc for $TAG_NAME is now live on gh-pages."
+else
+  echo "ECHO: Javadoc deployment failed for $TAG_NAME."
+fi
+
+# Final exit
+exit $EXIT_CODE