forked from Mirrors/flatpak-builder
parent
b23b2667b2
commit
8f00199480
|
@ -6,13 +6,13 @@ branches:
|
|||
- try
|
||||
|
||||
required: true
|
||||
context: f26-primary
|
||||
context: f28-primary
|
||||
|
||||
# This test case wants an "unprivileged container with bubblewrap",
|
||||
# which we don't have right now; so just provision a VM and do a
|
||||
# docker --privileged run.
|
||||
host:
|
||||
distro: fedora/26/atomic
|
||||
distro: fedora/28/atomic
|
||||
|
||||
env:
|
||||
# TODO: CFLAGS: Readd -fsanitize-undefined-trap-on-error -fsanitize=address after debugging
|
||||
|
@ -29,7 +29,7 @@ tests:
|
|||
-e "ASAN_OPTIONS=${ASAN_OPTIONS:-}"
|
||||
-v /etc/yum.repos.d:/etc/yum.repos.d.host:ro
|
||||
-v $(pwd):/srv/code -w /srv/code
|
||||
registry.fedoraproject.org/fedora:26 /bin/sh -c
|
||||
registry.fedoraproject.org/fedora:28 /bin/sh -c
|
||||
"cp -fv /etc/yum.repos.d{.host/*.repo,} &&
|
||||
./ci/build-check.sh"
|
||||
|
||||
|
|
|
@ -12,13 +12,13 @@ pkg_install sudo which attr fuse \
|
|||
libcurl-devel \
|
||||
/usr/bin/{update-mime-database,update-desktop-database,gtk-update-icon-cache}
|
||||
pkg_install_testing ostree-devel ostree libyaml-devel
|
||||
pkg_install_if_os fedora gjs parallel clang
|
||||
pkg_install_if_os fedora gjs parallel clang python2
|
||||
pkg_install_builddeps flatpak
|
||||
|
||||
(git clone --depth=1 https://github.com/flatpak/flatpak/
|
||||
cd flatpak
|
||||
unset CFLAGS # the sanitizers require calling apps be linked too
|
||||
build
|
||||
build --disable-introspection
|
||||
make install
|
||||
flatpak --version
|
||||
)
|
||||
|
|
|
@ -55,5 +55,6 @@ pkg_install_builddeps() {
|
|||
# builddeps+runtime deps
|
||||
pkg_builddep $pkg
|
||||
pkg_install $pkg
|
||||
rpm -e $pkg
|
||||
yum -y update gcc gcc-c++ annobin # This had some weird conflict with gcc
|
||||
rpm -e --nodeps $pkg
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue