Merge pull request #1374 from mathbunnyru/asalikhov/docs_build_process

Make docs build process less obscure
jupyter · Jun 21, 2021 · 34992fe · 34992fe
2 parents 7db544f + 28f4035
commit 34992fe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 60 deletions.
diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - master
+      - main
     paths:
       - "docs/**"
       - ".github/workflows/sphinx.yml"
@@ -35,11 +36,10 @@ jobs:
       - name: Build Documentation
         run: make docs
       - name: Extract Source Strings
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
         working-directory: docs
         run: |
-          make gettext
-          sphinx-intl update -p _build/gettext -l en
+          sphinx-build -M gettext ./ ./_build/
+          sphinx-intl update -p ./_build/gettext -l en
       - name: Push Strings to Master
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
         run: make git-commit

diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ dev-env: ## install libraries required to build docs and run tests
 	@pip install -r requirements-dev.txt
 
 docs: ## build HTML documentation
-	make -C docs html
+	sphinx-build docs/ docs/_build/
 
 git-commit: LOCAL_PATH?=.
 git-commit: GITHUB_SHA?=$(shell git rev-parse HEAD)

diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/make.bat b/docs/make.bat