Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
9e6a8dfe
Commit
9e6a8dfe
authored
Feb 21, 2018
by
Joost Rijneveld
Browse files
Merge branch 'thread-sphinx-build' into 'master'
Run sphinx-build on all cores See merge request
!731
parents
8511044b
198d1959
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
9e6a8dfe
...
...
@@ -55,7 +55,7 @@ docs:
script
:
-
echo "Building current docs"
-
env -u GITLAB_CI make doctest
-
env -u GITLAB_CI sphinx-build -M html "." "_build" -W
-
env -u GITLAB_CI sphinx-build -M html "." "_build" -W
-j $(nproc)
-
echo "Checking if there are changes"
-
./generate-apidocs.sh
-
git diff --exit-code
...
...
resources/entrypoint.sh
View file @
9e6a8dfe
...
...
@@ -2,7 +2,7 @@
set
-e
sphinx-build
-b
html /usr/src/app/docs/ /concrexit/docs/
sphinx-build
-b
html /usr/src/app/docs/ /concrexit/docs/
-j
$(
nproc
)
until
psql
-h
"
$DJANGO_POSTGRES_HOST
"
-U
"postgres"
-c
'\l'
;
do
>
&2
echo
"PostgreSQL is unavailable: Sleeping"
...
...
resources/entrypoint_production.sh
View file @
9e6a8dfe
...
...
@@ -3,7 +3,7 @@
set
-e
>
&2
echo
"Creating Sphinx documentation"
sphinx-build
-b
html /usr/src/app/docs/ /concrexit/docs/
sphinx-build
-b
html /usr/src/app/docs/ /concrexit/docs/
-j
$(
nproc
)
until
psql
-h
"
$DJANGO_POSTGRES_HOST
"
-U
"postgres"
-c
'\l'
$POSTGRES_DB
;
do
>
&2
echo
"PostgreSQL is unavailable: Sleeping"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment