diff --git a/ci/build.sh b/ci/build.sh index 5ebaaf235..c18e8e5b8 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -6,23 +6,12 @@ set -xeuo pipefail dn=$(dirname $0) . ${dn}/libbuild.sh -pkg_install_builddeps flatpak pkg_install sudo which attr fuse \ libubsan libasan libtsan \ - elfutils ostree git gettext-devel \ + elfutils git gettext-devel \ /usr/bin/{update-mime-database,update-desktop-database,gtk-update-icon-cache} +pkg_install_testing ostree-devel ostree pkg_install_if_os fedora gjs parallel clang - -# Use ostree minimal dependency -(git clone -b v2017.11 --depth=1 https://github.com/ostreedev/ostree/ - cd ostree - pkg_install_builddeps ostree - unset CFLAGS # the sanitizers require calling apps be linked too - build - make - make install - ostree --version -) - +pkg_install_builddeps flatpak build --enable-gtk-doc ${CONFIGOPTS:-} diff --git a/ci/libbuild.sh b/ci/libbuild.sh index fef9d3ae5..7ab83bb2e 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -14,6 +14,10 @@ pkg_install() { yum -y install "$@" } +pkg_install_testing() { + yum -y install --enablerepo=updates-testing "$@" +} + pkg_install_if_os() { os=$1 shift