diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index 73ee8de6..dd5fbfe9 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -12,6 +12,11 @@ on: - 'master' - 'lts/**' pull_request: + paths-ignore: + - 'ansible/**' + - 'doc/**' + - 'sphinx/**' + - 'scripts/**' branches: - 'master' - 'lts/**' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 815b54b7..c92601cb 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -12,6 +12,11 @@ on: - 'master' - 'lts/**' pull_request: + paths-ignore: + - 'ansible/**' + - 'doc/**' + - 'sphinx/**' + - 'scripts/**' branches: - 'master' - 'lts/**' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1ce11805..deb96f02 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -12,6 +12,11 @@ on: - 'master' - 'lts/**' pull_request: + paths-ignore: + - 'ansible/**' + - 'doc/**' + - 'sphinx/**' + - 'scripts/**' branches: - 'master' - 'lts/**' diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 77480dd1..4a02af35 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -12,6 +12,11 @@ on: - 'master' - 'lts/**' pull_request: + paths-ignore: + - 'ansible/**' + - 'doc/**' + - 'sphinx/**' + - 'scripts/**' branches: - 'master' - 'lts/**' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 18b75f16..2f8f481e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,6 +12,11 @@ on: - 'master' - 'lts/**' pull_request: + paths-ignore: + - 'ansible/**' + - 'doc/**' + - 'sphinx/**' + - 'scripts/**' branches: - 'master' - 'lts/**' diff --git a/sphinx/g3proxy/conf.py b/sphinx/g3proxy/conf.py index 24ee6e4f..3a482235 100644 --- a/sphinx/g3proxy/conf.py +++ b/sphinx/g3proxy/conf.py @@ -14,9 +14,7 @@ # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration -extensions = [ - "sphinx.ext.graphviz", -] +extensions = [] templates_path = ['_templates'] exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] @@ -33,6 +31,3 @@ # The default changed from 'contents' to 'index' from sphinx version 2.0, # so we need to explicitly set it in order to be compatible with old versions. master_doc = 'index' - -# Use 'svg' format for graphviz -graphviz_output_format = 'svg' diff --git a/sphinx/g3tiles/conf.py b/sphinx/g3tiles/conf.py index b1529106..ea280568 100644 --- a/sphinx/g3tiles/conf.py +++ b/sphinx/g3tiles/conf.py @@ -19,14 +19,12 @@ templates_path = ['_templates'] exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] - # -- Options for HTML output ------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output html_theme = "sphinx_rtd_theme" html_static_path = ['_static'] - # -- Custom Options ---------------------------------------------------------- # Set the master document, which contains the root toctree directive.