From 875c6094249c21562204584001b737bf1fd37cf1 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 23 Jun 2025 21:06:46 +0200 Subject: [PATCH 1/3] Build epub ARM as part of docs jobs --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9434bd93c6..304ea54ce0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -477,7 +477,7 @@ stages: stage: docs script: - *configure - - meson compile -C build arm man + - meson compile -C build arm arm-epub man - find build/man/ -maxdepth 2 -name "*.[0-9]" -exec mandoc -T lint "{}" \; | ( ! grep -v -e "skipping paragraph macro. sp after" -e "unknown font, skipping request. ft C" -e "input text line longer than 80 bytes" ) - test -z "${DOC_CHECK_MISC_CHANGE}" || ninja -C build doc-misc - test -z "${DOC_CHECK_MISC_CHANGE}" || cp build/doc/misc/options build/doc/misc/rndc.grammar build/doc/misc/*.zoneopt doc/misc/ From 54ea6722e5e4fb77306b4f39585197cf0a1177ce Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 23 Jun 2025 21:07:52 +0200 Subject: [PATCH 2/3] Create "srcid" file as part of release tarball Change the name of the source ID file to what we used to deliver. --- meson.build | 6 +++--- util/meson-dist-package.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 0168c071ca..1e91c119e6 100644 --- a/meson.build +++ b/meson.build @@ -121,11 +121,11 @@ sbindir = prefix / get_option('sbindir') sysconfdir = prefix / get_option('sysconfdir') src_id = '' -if fs.is_file('.source-id') - src_id = fs.read('.source-id', encoding: 'utf-8').strip() +if fs.is_file('srcid') + src_id = fs.read('srcid', encoding: 'utf-8').strip() elif git.found() src_id = run_command(git, 'rev-parse', '--short', 'HEAD', check: true).stdout().substring(0, 7) - meson.add_dist_script('util' / 'meson-dist-package.sh', 'source-id', src_id) + meson.add_dist_script('util' / 'meson-dist-package.sh', 'srcid', src_id) endif ### Compiler diff --git a/util/meson-dist-package.sh b/util/meson-dist-package.sh index ec1d76c4df..7a60e18c75 100644 --- a/util/meson-dist-package.sh +++ b/util/meson-dist-package.sh @@ -61,8 +61,8 @@ generate_man_pages() { } case $1 in - "source-id") - echo $2 >$MESON_DIST_ROOT/.source-id + "srcid") + echo $2 >$MESON_DIST_ROOT/srcid ;; "manual") generate_man_pages $2 $3 From 980973519563c0b3d5f24d9b617fb68798c8443d Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 23 Jun 2025 21:08:44 +0200 Subject: [PATCH 3/3] Fix release CI job with meson Fix documentation paths. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 304ea54ce0..c96f3eee64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1361,12 +1361,12 @@ release: # Prepare release tarball contents (tarballs + documentation) - mkdir -p "${BIND_DIRECTORY}-release/doc/arm" - pushd "${BIND_DIRECTORY}-release" - - mv "../${BIND_DIRECTORY}.tar.xz" . + - mv "../build/meson-dist/${BIND_DIRECTORY}.tar.xz" . - tar --extract --file="${BIND_DIRECTORY}.tar.xz" - mv "${BIND_DIRECTORY}"/{COPYRIGHT,LICENSE,README.md,srcid} . - rm -rf "${BIND_DIRECTORY}" - - mv "../doc/arm/_build/html" doc/arm/ - - mv "../doc/arm/_build/epub/Bv9ARM.epub" doc/arm/ + - mv ../build/arm/ doc/arm/html/ + - mv ../build/arm-epub/Bv9ARM.epub doc/arm/ - echo 'Redirect' > "RELEASE-NOTES-${BIND_DIRECTORY}.html" - echo 'Redirect' > "CHANGELOG-${BIND_DIRECTORY}.html" - popd