diff --git a/build_tools/release.sh b/build_tools/release.sh index 3b86d5703..78eb9f9c6 100755 --- a/build_tools/release.sh +++ b/build_tools/release.sh @@ -18,15 +18,18 @@ fi [ -n "$version" ] for tool in \ + cmake \ bundle \ diff \ gh \ gpg \ jq \ + ninja \ ruby \ tar \ timeout \ uv \ + xz \ ; do if ! command -v "$tool" >/dev/null; then echo >&2 "$0: missing command: $1" @@ -134,7 +137,7 @@ fish_tar_xz=fish-$version.tar.xz ( local_tarball=$tmpdir/local-tarball mkdir "$local_tarball" - FISH_ARTEFACT_PATH=$local_tarball uv run ./build_tools/make_tarball.sh + FISH_ARTEFACT_PATH=$local_tarball ./build_tools/make_tarball.sh cd "$local_tarball" tar xf "$fish_tar_xz" ) @@ -162,9 +165,16 @@ actual_tag_oid=$(git ls-remote "$remote" | gh release upload "$version" "$fish_tar_xz.asc" ) +( + cd "$tmpdir/local-tarball/fish-$version" + uv --no-managed-python venv + . .venv/bin/activate + cmake -GNinja -DCMAKE_BUILD_TYPE=Debug . + ninja doc +) CopyDocs() { rm -rf "$fish_site/site/docs/$1" - cp -r "$tmpdir/fish-$version/user_doc/html" "$fish_site/site/docs/$1" + cp -r "$tmpdir/local-tarball/fish-$version/user_doc/html" "$fish_site/site/docs/$1" git -C $fish_site add "site/docs/$1" } minor_version=${version%.*} diff --git a/doc_src/conf.py b/doc_src/conf.py index 432ea8b66..0da3834b2 100644 --- a/doc_src/conf.py +++ b/doc_src/conf.py @@ -129,10 +129,6 @@ else: ("../build_tools/git_version_gen.sh", "--stdout"), stderr=subprocess.STDOUT ).decode("utf-8") -predetermined_timestamp = os.environ.get("FISH_SPHINX_BUILD_DATE") -if predetermined_timestamp: - today = predetermined_timestamp - # The full version, including alpha/beta/rc tags release = ret.strip().split(" ")[-1] # The short X.Y version