Skip to content

Commit 3b3e026

Browse files
authored
Merge pull request #3236 from OpenShot/auto-sphinx-update
Automatically create and update sphinx documentation on openshot.org
2 parents 8d1c0ad + 67c2598 commit 3b3e026

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.gitlab-ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ linux-builder:
2020
- export LD_LIBRARY_PATH=$CI_PROJECT_DIR/build/install-x64/lib:$LD_LIBRARY_PATH
2121
- echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "build/install-x64/share/$CI_PROJECT_NAME"
2222
- git log $(git describe --tags --abbrev=0 @^)..@ --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x64/share/$CI_PROJECT_NAME.log"
23+
- cd doc; make html; cd ..;
24+
- ~/auto-update-sphinx "$CI_PROJECT_DIR/build" "$CI_COMMIT_REF_NAME"
2325
- python3 freeze.py build
2426
- python3 installer/build-server.py "$SLACK_TOKEN" "$S3_ACCESS_KEY" "$S3_SECRET_KEY" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME"
2527
when: always

doc/titles.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ Overview
3030
.. image:: images/title-editor.jpg
3131

3232
.. table::
33-
:widths: 5 26
33+
:widths: 5 26
3434

35-
== ================== ============
36-
# Name Description
37-
== ================== ============
38-
1 Choose a Template Choose from any available vector title template
39-
2 Preview Title Preview your title as you make changes
40-
3 Title Properties Change the text, colors, or edit in an advanced SVG image editor (such as Inkscape)
41-
4 Save Save and add the title to your project
42-
== ================== ============
35+
== ================== ============
36+
# Name Description
37+
== ================== ============
38+
1 Choose a Template Choose from any available vector title template
39+
2 Preview Title Preview your title as you make changes
40+
3 Title Properties Change the text, colors, or edit in an advanced SVG image editor (such as Inkscape)
41+
4 Save Save and add the title to your project
42+
== ================== ============
4343

4444
Custom Titles
4545
-------------

0 commit comments

Comments
 (0)