mirror of
https://github.com/flatpak/flatpak.git
synced 2026-07-12 00:59:18 -04:00
Use packaged ostree from updates-testing
This is faster than always rebuilding it Closes: #1047 Approved by: alexlarsson
This commit is contained in:
committed by
Atomic Bot
parent
d97f6dbf24
commit
a77b96faec
17
ci/build.sh
17
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:-}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user