mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mnowak/unify-doc-tools-versions' into 'main'

Browse Source 
Install Sphinx tools versions from BIND 9 repository

See merge request isc-projects/bind9!8251
This commit is contained in:
Michal Nowak
2023-08-31 12:50:04 +00:00
parent 3e5ccc3089 520e97e2fc
commit 6f53d34201
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/arm/requirements.txt
View File

@@ -1,5 +1,5 @@
# Make Read the Docs use the exact same package versions as in # docutils < 0.19 are required for RHEL 8 and older (but we don't care about these)
# registry.gitlab.isc.org/isc-projects/images/bind9:debian-bookworm-amd64 # and by the latest sphinx-rtd-theme (and we care about that one)
Sphinx==6.2.1 Sphinx==6.2.1
docutils==0.18.1 docutils==0.18.1
sphinx_rtd_theme==1.2.2 sphinx_rtd_theme==1.2.2

7
util/release-tarball-comparison.sh
View File

@@ -63,10 +63,6 @@ run_in_container "apt-get update && \
xz-utils \ xz-utils \
" "
run_in_container "apt-get -y install --no-install-recommends python3-pip && \
rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED && \
pip3 install docutils==0.18.1 sphinx-rtd-theme==1.2.2 sphinx==6.2.1"
# Retrieve the release-ready BIND 9 tarball. # Retrieve the release-ready BIND 9 tarball.
docker cp "${BIND_TARBALL}" "${CONTAINER_ID}:/usr/src" docker cp "${BIND_TARBALL}" "${CONTAINER_ID}:/usr/src"
@@ -76,6 +72,9 @@ BIND_DIRECTORY="bind-${BIND_VERSION}"
# Prepare a temporary "release" tarball from upstream BIND 9 project. # Prepare a temporary "release" tarball from upstream BIND 9 project.
run_in_container "git -c advice.detachedHead=false clone --branch v${BIND_VERSION} --depth 1 https://${GITLAB_USER}:${GITLAB_TOKEN}@gitlab.isc.org/isc-private/bind9.git && \ run_in_container "git -c advice.detachedHead=false clone --branch v${BIND_VERSION} --depth 1 https://${GITLAB_USER}:${GITLAB_TOKEN}@gitlab.isc.org/isc-private/bind9.git && \
cd bind9 && \ cd bind9 && \
apt-get -y install --no-install-recommends python3-pip && \
rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED && \
pip3 install \$(awk '!/^#/ { printf \"%s \", \$0 }' doc/arm/requirements.txt) && \
if [ $(echo "${BIND_VERSION}" | cut -b 1-5) = 9.16. ]; then \ if [ $(echo "${BIND_VERSION}" | cut -b 1-5) = 9.16. ]; then \
git archive --prefix=${BIND_DIRECTORY}/ --output=${BIND_DIRECTORY}.tar HEAD && \ git archive --prefix=${BIND_DIRECTORY}/ --output=${BIND_DIRECTORY}.tar HEAD && \
mkdir ${BIND_DIRECTORY} && \ mkdir ${BIND_DIRECTORY} && \