Merge branch 'master' into dependabot/pip/sphinx-approx-eq-8.0.2

openwisp · Aug 4, 2024 · d3141b2 · d3141b2
2 parents 8ede712 + f704363
commit d3141b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.py b/build.py
@@ -309,7 +309,7 @@ def main():
     html_base_url = ''
     build_dir = '_build'
     if os.environ.get('PRODUCTION', False):
-        docs_root = '/docs/__new__'
+        docs_root = '/docs/'
         html_base_url = 'https://openwisp.io'
         build_dir = f'{build_dir}/{docs_root}'
 

diff --git a/config.yml b/config.yml
@@ -32,8 +32,8 @@ versions:
     overwrite_modules: true
     modules:
       - name: openwisp-docs
-        branch: '22.05-restructed-docs'
+        branch: 'v22.05'
         dir_name: openwisp-docs
     sphinx_src_dir: ./openwisp-docs
   - name: dev
-    branch: reorder-docs
+    branch: master
diff --git a/run-qa-checks b/run-qa-checks
@@ -22,7 +22,7 @@ python -m http.server 8001 &> /dev/null & pid=$!
 sleep 4
 BASE_URL="http://localhost:8001"
 if [ -n "${PRODUCTION:-}" ]; then
-    BASE_URL="$BASE_URL/docs/__new__"
+    BASE_URL="$BASE_URL/docs/"
 fi
 pylinkvalidate.py "$BASE_URL/dev/" \
     -w 4 -m process