Merge pull request #1728 from buildtesters/strict_readthedocs_build

enable fail_on_warning in .readthedocs.yaml
buildtesters · Mar 13, 2024 · c2fb5e7 · c2fb5e7
2 parents cd75c83 + e06a27e
commit c2fb5e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -5,7 +5,7 @@ version: 2
 sphinx:
  builder: html
  configuration: docs/conf.py
- #fail_on_warning: true
+ fail_on_warning: true
 
 build:
  os: "ubuntu-20.04"

diff --git a/buildtest/defaults.py b/buildtest/defaults.py
@@ -24,19 +24,19 @@
 # dictionary used for storing status of builds
 USER_SETTINGS_FILE = os.path.join(BUILDTEST_USER_HOME, "config.yml")
 
-# default configuration file
-DEFAULT_SETTINGS_FILE = os.path.join(
- BUILDTEST_ROOT, "buildtest", "settings", "config.yml"
-)
 
-VAR_DIR = os.path.join(BUILDTEST_ROOT, "var")
+# VAR_DIR = os.path.join(BUILDTEST_ROOT, "var")
 ci_dir = os.getenv("BUILDTEST_CI_DIR")
 
 if ci_dir:
  VAR_DIR = os.path.join(ci_dir, "var")
- settings_file = os.path.join(ci_dir, "config.yml")
- DEFAULT_SETTINGS_FILE = settings_file
-
+ DEFAULT_SETTINGS_FILE = os.path.join(ci_dir, "config.yml")
+else:
+ VAR_DIR = os.path.join(BUILDTEST_ROOT, "var")
+ # default configuration file
+ DEFAULT_SETTINGS_FILE = os.path.join(
+ BUILDTEST_ROOT, "buildtest", "settings", "config.yml"
+ )
 
 BUILDTEST_LOGFILE = os.path.join(VAR_DIR, "buildtest.log")
 DEFAULT_LOGDIR = os.path.join(VAR_DIR, "logs")