diff options
author | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-05-29 19:09:07 -0700 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-31 19:27:04 +0000 |
commit | bf3525adcbdcafa67597c216ed4465d4bceadd54 (patch) | |
tree | 0070f761383891c00ad2ad2836a7f68a2c384527 /ci | |
parent | 6a7620b58d901ecbee021e829b34a9645d2e8a6d (diff) | |
download | ostree-bf3525adcbdcafa67597c216ed4465d4bceadd54.tar.gz |
ci: Use master branch as flatpak tag
Closes: #1607
Approved by: jlebon
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/flatpak.sh | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/ci/flatpak.sh b/ci/flatpak.sh index 015cd390..c47171f2 100755 --- a/ci/flatpak.sh +++ b/ci/flatpak.sh @@ -3,38 +3,24 @@ set -xeuo pipefail -# Frozen to a tag for now to help predictability; it's -# also useful to test building *older* versions since -# that must work. -FLATPAK_TAG=0.10.2.1 +FLATPAK_TAG=master dn=$(dirname $0) . ${dn}/libpaprci/libbuild.sh codedir=$(pwd) -pkg_upgrade -pkg_install_buildroot -pkg_builddep ostree flatpak -pkg_install gettext-devel # A new dependency -# Copy of builddeps from build.sh in flatpak -pkg_install sudo which attr fuse \ - libubsan libasan libtsan \ - elfutils git gettext-devel libappstream-glib-devel \ - /usr/bin/{update-mime-database,update-desktop-database,gtk-update-icon-cache} \ - hicolor-icon-theme -pkg_install flatpak && rpm -e flatpak - # Build and install ostree cd ${codedir} -build +ci/build.sh make install + +# Build flatpak tmpd=$(mktemp -d) cd ${tmpd} -# Frozen to a tag for now on general principle git clone --recursive --depth=1 -b ${FLATPAK_TAG} https://github.com/flatpak/flatpak cd ${tmpd}/flatpak -build +ci/build.sh # We want to capture automake results from flatpak cleanup() { mv test-suite.log ${codedir} || true |