Fix up docs link

README.md

@@ -6,7 +6,7 @@ Flatpak-builder is a tool for building flatpaks from sources.
 
 See http://flatpak.org/ for more information.
 
-Read documentation for the flatpak-builder [commandline tools](http://flatpak.github.io/flatpak/flatpak-docs.html).
+Read documentation for the flatpak-builder [commandline tools](http://flatpak.org/flatpak/flatpak-docs.html).
 
 # INSTALLATION
 

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

src/builder-cache.c

@@ -1037,8 +1037,6 @@ builder_cache_get_changes_to (BuilderCache *self,
                               GError      **error)
 {
   g_autoptr(GFile) parent_root = NULL;
-  g_autoptr(GVariant) variant = NULL;
-  g_autofree char *parent_commit = NULL;
 
   if (self->last_parent != NULL &&
       !ostree_repo_read_commit (self->repo, self->last_parent, &parent_root, NULL, NULL, error))

src/builder-flatpak-utils.c

@@ -394,8 +394,6 @@ flatpak_compose_ref (gboolean    app,
                      const char *arch,
                      GError    **error)
 {
-  g_autoptr(GError) local_error = NULL;
-
   if (app)
     return flatpak_build_app_ref (name, branch, arch);
   else

src/builder-module.c

@@ -1253,7 +1253,6 @@ builder_module_build_helper (BuilderModule  *self,
   g_autoptr(GFile) source_subdir = NULL;
   const char *source_subdir_relative = NULL;
   g_autofree char *source_dir_path = NULL;
-  g_autoptr(GError) my_error = NULL;
   BuilderPostProcessFlags post_process_flags = 0;
 
   source_dir_path = g_file_get_path (source_dir);