Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
This builds flatpak master before building flatpak-builder and installs
ostree 2017.11 from fedora.
Also it adds gettext-devel which is used for autopoint.
  • Loading branch information
alexlarsson committed Sep 27, 2017
1 parent dbd3c72 commit 0d2755c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
17 changes: 7 additions & 10 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,20 @@ 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 \
libubsan libasan libtsan elfutils-libelf-devel libdwarf-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
pkg_install_builddeps flatpak

# Temporarily build ostree from git master for https://github.com/flatpak/flatpak/pull/848
(git clone --depth=1 https://github.com/ostreedev/ostree/
cd ostree
pkg_install_builddeps ostree
(git clone --depth=1 https://github.com/flatpak/flatpak/
cd flatpak
unset CFLAGS # the sanitizers require calling apps be linked too
build
make
make install
ostree --version
flatpak --version
)


build --enable-gtk-doc ${CONFIGOPTS:-}
4 changes: 4 additions & 0 deletions ci/libbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0d2755c

Please sign in to comment.