From c440b3e07b0d00a5ea080ff804516136e0c92a43 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 27 Sep 2017 16:37:07 +0200 Subject: [PATCH 1/4] Fix up docs link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4a2a678..0213a381 100644 --- a/README.md +++ b/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 From dbd3c721e699d0ce0dd98602fbe1f9a545ecce30 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 27 Sep 2017 20:37:43 +0200 Subject: [PATCH 2/4] Remove unused variables These were reported by clang --- src/builder-cache.c | 2 -- src/builder-flatpak-utils.c | 2 -- src/builder-module.c | 1 - 3 files changed, 5 deletions(-) diff --git a/src/builder-cache.c b/src/builder-cache.c index 2c3b4484..6ee254f2 100644 --- a/src/builder-cache.c +++ b/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)) diff --git a/src/builder-flatpak-utils.c b/src/builder-flatpak-utils.c index e1b6e8d6..2634af01 100644 --- a/src/builder-flatpak-utils.c +++ b/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 diff --git a/src/builder-module.c b/src/builder-module.c index 151f022c..7e0559fa 100644 --- a/src/builder-module.c +++ b/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); From 0d2755c03f4c65404c724e179077e23f6008c62f Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 27 Sep 2017 17:10:50 +0200 Subject: [PATCH 3/4] 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. --- ci/build.sh | 17 +++++++---------- ci/libbuild.sh | 4 ++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 64ed4624..66e9843e 100755 --- a/ci/build.sh +++ b/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:-} diff --git a/ci/libbuild.sh b/ci/libbuild.sh index fef9d3ae..7ab83bb2 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 From ee1f6b7f381eb6d65f5b32532709da329236602b Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 28 Sep 2017 10:48:39 +0200 Subject: [PATCH 4/4] fixup! Fix CI --- ci/libbuild.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/libbuild.sh b/ci/libbuild.sh index 7ab83bb2..af5e7741 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -15,6 +15,7 @@ pkg_install() { } pkg_install_testing() { + yum -y --repo=updates-testing clean expire-cache yum -y install --enablerepo=updates-testing "$@" }