Skip to content

Commit 700d0bb

Browse files
authored
Fix debian package build (#1612)
* fix debian-package-build task, use debian12-latest-small distro * don't try to install _images dir which is no longer present Follow-up for 74747dc
1 parent f354fde commit 700d0bb

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

.evergreen/generated_configs/legacy-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14491,7 +14491,7 @@ buildvariants:
1449114491
name: ocsp-openssl-1.0.1
1449214492
- name: packaging
1449314493
display_name: Linux Distro Packaging
14494-
run_on: ubuntu1804-test
14494+
run_on: debian12-latest-small
1449514495
tasks:
1449614496
- debian-package-build
1449714497
- name: rpm-package-build

.evergreen/legacy_config_generator/evergreen_config_lib/variants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ def days(n: int) -> int:
486486
Variant(
487487
"packaging",
488488
"Linux Distro Packaging",
489-
"ubuntu1804-test",
489+
"debian12-latest-small",
490490
[
491491
"debian-package-build",
492492
OD([("name", "rpm-package-build"), ("distros", ["rhel90-arm64-small"])]),

.evergreen/scripts/debian_package_build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ if [ "${IS_PATCH}" = "true" ]; then
3131
git checkout ${CURRENT_BRANCH}
3232
git checkout upstream/debian/unstable -- ./debian/
3333
if [ -s ../upstream.patch ]; then
34+
git config user.email "[email protected]"
35+
git config user.name "Evergreen Patch Build"
3436
[ -d debian/patches ] || mkdir debian/patches
3537
mv ../upstream.patch debian/patches/
3638
echo upstream.patch >> debian/patches/series

build/cmake/SphinxBuild.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,6 @@ function (sphinx_build_html target_name doc_dir)
8787
DESTINATION
8888
${CMAKE_INSTALL_DOCDIR}/${doc_dir}/html
8989
)
90-
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/static)
91-
install (DIRECTORY
92-
${SPHINX_HTML_DIR}/_images
93-
DESTINATION
94-
${CMAKE_INSTALL_DOCDIR}/${doc_dir}/html
95-
)
96-
endif ()
9790

9891
add_custom_target (${target_name} DEPENDS ${doc_htmls})
9992
endfunction ()

0 commit comments

Comments
 (0)