Skip to content

Commit

Permalink
Merge pull request #1180 from michael-wisely-gravwell/merge/v5.4.5-to…
Browse files Browse the repository at this point in the history
…-v5.4.6
  • Loading branch information
ashnwade authored Oct 15, 2024
2 parents cd3d677 + 6a5e7b2 commit 4dbad43
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
8 changes: 7 additions & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
author = "Gravwell, Inc."
release = "v5.4.6"

# Default to localhost:8000, so the version switcher looks OK on livehtml
version_list_url = os.environ.get(
"VERSION_LIST_URL", "http://localhost:8000/_static/versions.json"
)
print("Using version_list_url:", version_list_url)

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

Expand Down Expand Up @@ -96,7 +102,7 @@
# Version switcher
#
"switcher": {
"json_url": "https://docs.gravwell.io/_static/versions.json",
"json_url": version_list_url,
# The `version` field of each entry in verions.json must match a vN.N.N release name
"version_match": release,
},
Expand Down
3 changes: 3 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{ VERSION_LIST_URL ? null }:
let
# use a specific (although arbitrarily chosen) version of the Nix package collection
pkgs = import (fetchTarball {
Expand Down Expand Up @@ -66,6 +67,8 @@ in pkgs.stdenv.mkDerivation {
name = "gravwell-wiki";
src = ./.;

VERSION_LIST_URL = VERSION_LIST_URL;

buildInputs = [ pythonBundle pkgs.gnumake pkgs.git custom-aspell ];
buildPhase = ''
make clean html
Expand Down

0 comments on commit 4dbad43

Please sign in to comment.