Merge pull request #208 from yuanyl630/feat/remove-nested-v5.1-structure

remove the directory v5.1

Author: gaoxueyu

.github/workflows/merge-build-push.yml

@@ -84,7 +84,8 @@ jobs:
               echo # Newline for better readability
 
               if [[ -n "$DETECTED_VERSION" ]]; then
-                NEW_START_PAGE="${START_PAGE_COMPONENT_NAME}::v${DETECTED_VERSION}/${START_PAGE_FILE_PATH}"
+                # All branches use flat structure (single-level path): ivorysql-doc:v5.1:welcome.adoc
+                NEW_START_PAGE="${START_PAGE_COMPONENT_NAME}:v${DETECTED_VERSION}:${START_PAGE_FILE_PATH}"
                 yq -i ".site.start_page = \"$NEW_START_PAGE\"" "$PLAYBOOK_FILE"
                 echo "Updated .site.start_page in $PLAYBOOK_FILE to: $NEW_START_PAGE"
               else
@@ -133,7 +134,9 @@ jobs:
           set -euo pipefail
 
           TARGET_BRANCH="v${LATEST_VERSION}"
-          EXPECTED_PATH="ivorysql-doc/v${LATEST_VERSION}/v${LATEST_VERSION}/welcome.html"
+          
+          # All versions use flat structure (single-level path): ivorysql-doc/v5.1/welcome.html
+          EXPECTED_PATH="ivorysql-doc/v${LATEST_VERSION}/welcome.html"
 
           if [[ "${MERGED_PR_BASE}" != "${TARGET_BRANCH}" ]]; then
             echo "Base branch ${MERGED_PR_BASE} is not the latest version branch ${TARGET_BRANCH}, skip index redirect check."
@@ -152,8 +155,9 @@ jobs:
             if grep -q "${EXPECTED_PATH}" "${FILE_PATH}"; then
               echo "${FILE_PATH} already points to latest ${LATEST_VERSION}."
             else
-              # Replace all version segments like vX.Y or vX.Y.Z in href/location/meta/script targets
-              sed -i -E "s@ivorysql-doc/v[0-9]+(\\.[0-9]+){1,2}/v[0-9]+(\\.[0-9]+){1,2}/welcome\\.html@${EXPECTED_PATH}@g" "${FILE_PATH}"
+              # Replace path to latest version
+              # Handle both old double-level and new single-level path formats
+              sed -i -E "s@ivorysql-doc/v[0-9]+(\\.[0-9]+){1,2}/(v[0-9]+(\\.[0-9]+){1,2}/)?welcome\\.html@${EXPECTED_PATH}@g" "${FILE_PATH}"
               UPDATE_NEEDED=true
               echo "Updated ${FILE_PATH} to latest ${LATEST_VERSION} redirect."
             fi

CN/antora.yml

@@ -1,7 +1,7 @@
 name: ivorysql-doc
 title: 文档中心
 version: v5.1
-start_page: v5.1/welcome.adoc
+start_page: welcome.adoc
 asciidoc:
   attributes:
     source-language: asciidoc@