Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge v5.4.3 to v5.4.4 #1178

Merged
merged 2 commits into from
Oct 15, 2024
Merged

chore: Merge v5.4.3 to v5.4.4 #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90248f4
Use env var to determine version list
michael-wisely-gravwell Oct 11, 2024
4469bd2
Merge pull request #1175 from michael-wisely-gravwell/configurable-ve…
ashnwade Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
author = "Gravwell, Inc."
release = "v5.4.3"

# 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
View file
Open in desktop
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