Merge pull request #1993 from dbnicholson/f29-rpmostree-fixes
ci/rpmostree: Bump to 2019.4
This commit is contained in:
commit
8cc81126a1
|
|
@ -6,7 +6,7 @@ set -xeuo pipefail
|
||||||
# Frozen to a tag for now to help predictability; it's
|
# Frozen to a tag for now to help predictability; it's
|
||||||
# also useful to test building *older* versions since
|
# also useful to test building *older* versions since
|
||||||
# that must work.
|
# that must work.
|
||||||
RPMOSTREE_TAG=v2019.3
|
RPMOSTREE_TAG=v2019.4
|
||||||
|
|
||||||
dn=$(dirname $0)
|
dn=$(dirname $0)
|
||||||
. ${dn}/libpaprci/libbuild.sh
|
. ${dn}/libpaprci/libbuild.sh
|
||||||
|
|
@ -18,12 +18,14 @@ pkg_install_buildroot
|
||||||
pkg_builddep ostree rpm-ostree
|
pkg_builddep ostree rpm-ostree
|
||||||
pkg_install rpm-ostree && rpm -e rpm-ostree
|
pkg_install rpm-ostree && rpm -e rpm-ostree
|
||||||
|
|
||||||
# Duplicate of deps from build.sh in rpm-ostree for tests
|
# Duplicate of deps from ci/installdeps.sh in rpm-ostree for tests
|
||||||
pkg_install ostree{,-devel,-grub2} createrepo_c /usr/bin/jq PyYAML \
|
pkg_install ostree{,-devel,-grub2} createrepo_c /usr/bin/jq python3-pyyaml \
|
||||||
libubsan libasan libtsan elfutils fuse sudo python-gobject-base \
|
libubsan libasan libtsan elfutils fuse sudo python3-gobject-base \
|
||||||
selinux-policy-devel selinux-policy-targeted openssh-clients ansible
|
selinux-policy-devel selinux-policy-targeted python3-createrepo_c \
|
||||||
# This one is in the papr.yml
|
rsync python3-rpm parallel clang rustfmt-preview
|
||||||
pkg_install rsync
|
|
||||||
|
# From rpm-ostree/ci/vmcheck-provision.sh
|
||||||
|
pkg_install openssh-clients ansible
|
||||||
|
|
||||||
# build+install ostree
|
# build+install ostree
|
||||||
cd ${codedir}
|
cd ${codedir}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue