diff --git a/conf.py b/conf.py index 448c97127e30c0ffb2a3feb944c7ac35f439710b..4b0342037fbeb8af77f4c646e425e4008d1bac26 100644 --- a/conf.py +++ b/conf.py @@ -81,9 +81,14 @@ with open(BBDOCS_BASE / "VERSION") as f: release = version -pages_url = "" -pages_slug = "" -docs_url = "" +# Variables here holds default settings +pages_url = "http://docs.beagleboard.io" +pages_slug = "latest" +gitlab_user = "docs" +gitlab_version = "main" +gitlab_host = "git.beagleboard.org" +gitlab_repo = "docs.beagleboard.io" +docs_url = "https://docs.beagleboard.io/latest/" # parse pages details from 'PAGES' file with open(BBDOCS_BASE / "PAGES") as f: @@ -91,6 +96,10 @@ with open(BBDOCS_BASE / "PAGES") as f: ( 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" + + r"^PROJECT_REPO\s*=\s*(\S+)$\n" ), f.read(), re.MULTILINE, @@ -99,18 +108,22 @@ with open(BBDOCS_BASE / "PAGES") as f: if not m: sys.stderr.write("Warning: Could not extract pages information\n") else: - url, slug = m.groups(1) + url, slug, user, branch, host, repo = m.groups(1) slug = "latest" if slug == "main" else slug pages_url = url pages_slug = slug + gitlab_user = user + gitlab_version = branch + gitlab_host = host + gitlab_repo = repo docs_url = "/".join((url, slug)) html_context = { "display_gitlab": True, - "gitlab_host": "git.beagleboard.org", - "gitlab_user": "docs", - "gitlab_repo": "docs.beagleboard.io", - "gitlab_version": "main", + "gitlab_host": gitlab_host, + "gitlab_user": gitlab_user, + "gitlab_repo": gitlab_repo, + "gitlab_version": gitlab_version, "conf_py_path": "/", "show_license": True, "pages_url": pages_url, diff --git a/gitlab-build.sh b/gitlab-build.sh index 550a1bbc37822c041680705825c4bc0bd9db2996..ab7f7a3cf04c820d4c5f379a0346f181eab73939 100755 --- a/gitlab-build.sh +++ b/gitlab-build.sh @@ -5,6 +5,10 @@ env cat << EOF > PAGES PAGES_URL = $CI_PAGES_URL PAGES_SLUG = $CI_COMMIT_BRANCH +GITLAB_USER = $CI_PROJECT_NAMESPACE +PROJECT_BRANCH = $CI_COMMIT_BRANCH +GITLAB_HOST = $CI_SERVER_HOST +PROJECT_REPO = $CI_PROJECT_NAME EOF if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then