diff options
| author | Michał Górny <mgorny@quansight.com> | 2025-07-18 20:39:51 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-07-19 11:50:59 -0700 |
| commit | c3531971abca0d0987e919f452227b61b392f969 (patch) | |
| tree | 2258e06fb163a150a51972c59bbe472fba434182 /ci/ciimage | |
| parent | 6c722589c946cb0bbd9536ac278f5726c0d05f63 (diff) | |
| download | meson-c3531971abca0d0987e919f452227b61b392f969.tar.gz | |
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 <mgorny@quansight.com>
Diffstat (limited to 'ci/ciimage')
| -rwxr-xr-x | ci/ciimage/fedora/install.sh | 9 | ||||
| -rwxr-xr-x | ci/ciimage/opensuse/install.sh | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh index aa8765561..2845555cb 100755 --- a/ci/ciimage/fedora/install.sh +++ b/ci/ciimage/fedora/install.sh @@ -17,6 +17,8 @@ pkgs=( qt6-qtdeclarative-devel qt6-qtbase-devel qt6-qttools-devel qt6-linguist qt6-qtbase-private-devel libwmf-devel valgrind cmake openmpi-devel nasm gnustep-base-devel gettext-devel ncurses-devel libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel libgcrypt-devel wayland-devel wayland-protocols-devel + # HACK: remove npm once we switch back to hotdoc sdist + nodejs-npm ) # Sys update @@ -24,7 +26,12 @@ dnf -y upgrade # Install deps dnf -y install "${pkgs[@]}" -install_python_packages hotdoc +# HACK: build hotdoc from git repo since current sdist is broken on modern compilers +# change back to 'hotdoc' once it's fixed +install_python_packages git+https://github.com/hotdoc/hotdoc + +# HACK: uninstall npm after building hotdoc, remove when we remove npm +dnf -y remove nodejs-npm # Cleanup dnf -y clean all diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh index 7a76071e5..18f4ea74b 100755 --- a/ci/ciimage/opensuse/install.sh +++ b/ci/ciimage/opensuse/install.sh @@ -19,6 +19,8 @@ pkgs=( boost-devel libboost_date_time-devel libboost_filesystem-devel libboost_locale-devel libboost_system-devel libboost_test-devel libboost_log-devel libboost_regex-devel libboost_python3-devel libboost_regex-devel + # HACK: remove npm once we switch back to hotdoc sdist + npm ) # Sys update @@ -27,7 +29,12 @@ zypper --non-interactive update # Install deps zypper install -y "${pkgs[@]}" -install_python_packages hotdoc +# HACK: build hotdoc from git repo since current sdist is broken on modern compilers +# change back to 'hotdoc' once it's fixed +install_python_packages git+https://github.com/hotdoc/hotdoc + +# HACK: uninstall npm after building hotdoc, remove when we remove npm +zypper remove -y -u npm echo 'export PKG_CONFIG_PATH="/usr/lib64/mpi/gcc/openmpi3/lib64/pkgconfig:$PKG_CONFIG_PATH"' >> /ci/env_vars.sh |