Skip to content

Commit c353197

Browse files
mgornydcbaker
authored andcommitted
Hack around hotdoc build failures
Build hotdoc from the git repository to work around the build failures resulting from C99 incompatibilities. The issues are already fixed, but the fix has not made it into a release yet. Signed-off-by: Michał Górny <[email protected]>
1 parent 6c72258 commit c353197

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

ci/ciimage/fedora/install.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,21 @@ pkgs=(
1717
qt6-qtdeclarative-devel qt6-qtbase-devel qt6-qttools-devel qt6-linguist qt6-qtbase-private-devel
1818
libwmf-devel valgrind cmake openmpi-devel nasm gnustep-base-devel gettext-devel ncurses-devel
1919
libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel libgcrypt-devel wayland-devel wayland-protocols-devel
20+
# HACK: remove npm once we switch back to hotdoc sdist
21+
nodejs-npm
2022
)
2123

2224
# Sys update
2325
dnf -y upgrade
2426

2527
# Install deps
2628
dnf -y install "${pkgs[@]}"
27-
install_python_packages hotdoc
29+
# HACK: build hotdoc from git repo since current sdist is broken on modern compilers
30+
# change back to 'hotdoc' once it's fixed
31+
install_python_packages git+https://github.com/hotdoc/hotdoc
32+
33+
# HACK: uninstall npm after building hotdoc, remove when we remove npm
34+
dnf -y remove nodejs-npm
2835

2936
# Cleanup
3037
dnf -y clean all

ci/ciimage/opensuse/install.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ pkgs=(
1919
boost-devel libboost_date_time-devel libboost_filesystem-devel libboost_locale-devel libboost_system-devel
2020
libboost_test-devel libboost_log-devel libboost_regex-devel
2121
libboost_python3-devel libboost_regex-devel
22+
# HACK: remove npm once we switch back to hotdoc sdist
23+
npm
2224
)
2325

2426
# Sys update
@@ -27,7 +29,12 @@ zypper --non-interactive update
2729

2830
# Install deps
2931
zypper install -y "${pkgs[@]}"
30-
install_python_packages hotdoc
32+
# HACK: build hotdoc from git repo since current sdist is broken on modern compilers
33+
# change back to 'hotdoc' once it's fixed
34+
install_python_packages git+https://github.com/hotdoc/hotdoc
35+
36+
# HACK: uninstall npm after building hotdoc, remove when we remove npm
37+
zypper remove -y -u npm
3138

3239
echo 'export PKG_CONFIG_PATH="/usr/lib64/mpi/gcc/openmpi3/lib64/pkgconfig:$PKG_CONFIG_PATH"' >> /ci/env_vars.sh
3340

0 commit comments

Comments
 (0)