remove slug from docs url

444aaa37 · Deepak Khatri · 05a4f858 · 444aaa37 · 444aaa37
Commit 444aaa37 authored 6 months ago by Deepak Khatri
--- a/conf.py
+++ b/conf.py
@@ -188,7 +188,6 @@ with open("PAGES") as f:
    m = re.match(
        (
            r"^PAGES_URL\s*=\s*(\S+)$\n"
-            + r"^PAGES_SLUG\s*=\s*(\S+)$\n"
            + r"^GITLAB_USER\s*=\s*(\S+)$\n"
            + r"^PROJECT_BRANCH\s*=\s*(\S+)$\n"
            + r"^GITLAB_HOST\s*=\s*(\S+)$\n"
@@ -201,16 +200,14 @@ with open("PAGES") as f:
    if not m:
        sys.stderr.write("Warning: Could not extract pages information\n")
    else:
-        url, slug, user, branch, host, repo = m.groups(1)
-        slug = "latest" if slug == "main" else slug
+        url, user, branch, host, repo = m.groups(1)
        pages_url = url
-        pages_slug = slug
        gitlab_user = user
        gitlab_version = branch
        gitlab_url = host
        gitlab_repo = repo
        gitlab_project = "/".join((gitlab_url, gitlab_user, gitlab_repo))
-        docs_url = "/".join((url, slug))
+        docs_url = url

 # HTML 
 html_theme = 'pydata_sphinx_theme'

--- a/gitlab-build.sh
+++ b/gitlab-build.sh
 #!/bin/bash -xe
-export VER_LATEST_MAJOR=1
-export VER_LATEST_MINOR=0
-export VER_LATEST_EXTRA=wip
-export PATCHLEVEL=$(date +%Y%m%d)
-export VERSION_TWEAK=$(( $(date "+10#%H * 60 + 10#%M") ))

 function do_build() {
-	echo "**** Updating $PAGES_URL/$VER_DIR: $1 ****"
+	echo "**** Updating $PAGES_URL: $1 ****"

 	cat << EOF > PAGES
 PAGES_URL =  $PAGES_URL
-PAGES_SLUG = $PAGES_SLUG
 GITLAB_USER = $GITLAB_USER
 PROJECT_BRANCH = $PROJECT_BRANCH
 GITLAB_HOST = $GITLAB_HOST
 PROJECT_REPO = $PROJECT_REPO
-EOF
-
-	cat << EOF > VERSION
-VERSION_MAJOR = $VERSION_MAJOR
-VERSION_MINOR = $VERSION_MINOR
-PATCHLEVEL = $PATCHLEVEL
-VERSION_TWEAK = $VERSION_TWEAK
-EXTRAVERSION = $EXTRAVERSION
 EOF

 	echo "**** make librobotcontrol xml ****"
@@ -34,18 +20,6 @@ EOF

 	if [ "x$1" == "xhtml" ]; then
 		mkdir -p public/html
-		cat <<HERE > public/html/redir.html
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="refresh" content="0; url='latest/'" />
-  </head>
-  <body>
-    <p>Please follow <a href="latest/">this link</a>.</p>
-  </body>
-</html>
-HERE
-
 		echo "**** make html ****"
 		# Build HTML
 		make html BUILDDIR=public
@@ -69,55 +43,28 @@ HERE

 	if [ "x$1" == "xpublish" ]; then
 		# Move files
-		mkdir -p public/$VER_DIR/
-		mv public/html/redir.html public/index.html
-		mv public/html/* public/$VER_DIR/
-		mv public/pdf/*.pdf public/$VER_DIR/
+		mkdir -p public/
+		mv public/html/* public/
+		mv public/pdf/*.pdf public/

 		# Update docs.beagleboard.org
 		if [ "$CI_COMMIT_TAG" != "" ]; then
 			mkdir -p ~/.ssh
 			eval "$(ssh-agent -s)"
 			echo "${PRIVATE_KEY}" | base64 -d | ssh-add -
-			if [ "$VER_DIR" = "latest" ]; then
-				rsync -e 'ssh -p 45 -o "StrictHostKeyChecking=no"' -vP public/index.html docs@beagleboard.org:/var/www/docs/
-			fi
-			rsync -e 'ssh -p 45 -o "StrictHostKeyChecking=no"' -avP --delete public/$VER_DIR/. docs@beagleboard.org:/var/www/docs/$VER_DIR
+			rsync -e 'ssh -p 45 -o "StrictHostKeyChecking=no"' -avP --delete public/. docs@beagleboard.org:/var/www/docs
 		fi
 	fi
 }

-if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
-	export VER_DIR=latest
-	export PAGES_URL=$CI_PAGES_URL
-	export PAGES_SLUG=$CI_COMMIT_BRANCH
-	export GITLAB_USER=$CI_PROJECT_NAMESPACE
-	export GITLAB_HOST=$CI_SERVER_HOST
-	export PROJECT_BRANCH=$CI_COMMIT_BRANCH
-	export PROJECT_REPO=$CI_PROJECT_NAME
-	export VERSION_MAJOR=$VER_LATEST_MAJOR
-	export VERSION_MINOR=$VER_LATEST_MINOR
-	export EXTRAVERSION=$VER_LATEST_EXTRA
-	do_build $1
-elif [ "$CI_COMMIT_BRANCH" != "" ]; then
-	export VER_DIR=$CI_COMMIT_BRANCH
+if [ "$CI_COMMIT_BRANCH" != "" ]; then
 	export PAGES_URL=$CI_PAGES_URL
-	export PAGES_SLUG=$CI_COMMIT_BRANCH
 	export GITLAB_USER=$CI_PROJECT_NAMESPACE
 	export GITLAB_HOST=$CI_SERVER_HOST
 	export PROJECT_BRANCH=$CI_COMMIT_BRANCH
 	export PROJECT_REPO=$CI_PROJECT_NAME
-	export BRANCH_VER=($(echo $CI_COMMIT_BRANCH | tr "." "\n"))
-	export VERSION_MAJOR=${BRANCH_VER[0]}
-	export VERSION_MINOR=${BRANCH_VER[1]}
-	export EXTRAVERSION=wip
 	do_build $1
 elif [ "$CI_COMMIT_TAG" != "" ]; then
-	export TAG_SPLIT=($(echo $CI_COMMIT_TAG | tr "-" "\n"))
-	export TAG_VER=($(echo ${TAG_SPLIT[0]} | tr "." "\n"))
-	export VERSION_MAJOR=${TAG_VER[0]}
-	export VERSION_MINOR=${TAG_VER[1]}
-	export EXTRAVERSION=${TAG_SPLIT[1]}
 	export PAGES_URL=https://docs.beagleboard.org
 	export GITLAB_USER=docs
 	export GITLAB_HOST=$CI_SERVER_HOST
@@ -125,13 +72,6 @@ elif [ "$CI_COMMIT_TAG" != "" ]; then
 	git fetch --all -v
 	export GIT_BRANCH=$(git branch -a --contains tags/$CI_COMMIT_TAG | grep origin | tr -d '* ' | sed 's/.*origin\///' | head -n 1)
 	export PROJECT_BRANCH=$GIT_BRANCH
-	if [ "$GIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
-		export VER_DIR=latest
-		export PAGES_SLUG=latest
-	else
-		export VER_DIR=$GIT_BRANCH
-		export PAGES_SLUG=$GIT_BRANCH
-	fi
 	export SPHINXOPTS="-D todo_include_todos=0"
 	do_build $1
 else