Fix CI

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.

Closes: #39
Approved by: alexlarsson

ci/build.sh

@@ -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:-}

ci/libbuild.sh

@@ -14,6 +14,11 @@ pkg_install() {
     yum -y install "$@"
 }
 
+pkg_install_testing() {
+    yum -y --repo=updates-testing clean expire-cache
+    yum -y install --enablerepo=updates-testing "$@"
+}
+
 pkg_install_if_os() {
     os=$1
     shift