[libvirt PATCH 3/3] cirrus: Refresh configurations

The information is coming from lcitool now, so it's more complete: this is immediately apparent when looking at the number of additional packages that end up being installed on macOS. This commit is best viewed with 'git show --word-diff'. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ci/cirrus/freebsd-12.yml.j2 | 10 ++++++---- ci/cirrus/macos-1015.yml.j2 | 14 ++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ci/cirrus/freebsd-12.yml.j2 b/ci/cirrus/freebsd-12.yml.j2 index a93f94ee2a..80083c65d7 100644 --- a/ci/cirrus/freebsd-12.yml.j2 +++ b/ci/cirrus/freebsd-12.yml.j2 @@ -5,7 +5,9 @@ env: CI_REPOSITORY_URL: {{ CI_REPOSITORY_URL }} CI_COMMIT_REF_NAME: {{ CI_COMMIT_REF_NAME }} CI_COMMIT_SHA: {{ CI_COMMIT_SHA }} - PKGS: augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof meson ncurses ninja patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl + PKGS: augeas autoconf automake avahi bash bash-completion ca_root_nss ccache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb gettext gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh libssh2 libtool libxml2 libxslt lsof meson ncurses ninja p5-App-cpanminus patch perl5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-wheel python3 qemu-utils radvd readline screen sudo vim yajl + MAKE: /usr/local/bin/gmake + PYTHON: /usr/local/bin/python3 freebsd_12_task: install_script: @@ -18,6 +20,6 @@ freebsd_12_task: - mkdir build - cd build - ../autogen.sh --prefix=$(pwd)/install-root - - gmake -j3 - - gmake -j3 install - - gmake -j3 dist + - $MAKE -j3 + - $MAKE -j3 install + - $MAKE -j3 dist diff --git a/ci/cirrus/macos-1015.yml.j2 b/ci/cirrus/macos-1015.yml.j2 index 0d3d54a97a..1a4e942613 100644 --- a/ci/cirrus/macos-1015.yml.j2 +++ b/ci/cirrus/macos-1015.yml.j2 @@ -5,9 +5,11 @@ env: CI_REPOSITORY_URL: {{ CI_REPOSITORY_URL }} CI_COMMIT_REF_NAME: {{ CI_COMMIT_REF_NAME }} CI_COMMIT_SHA: {{ CI_COMMIT_SHA }} - PATH: /usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH - PKG_CONFIG_PATH: /usr/local/opt/libxml2/lib/pkgconfig - PKGS: autoconf automake ccache docutils glib gnutls libtool libxml2 make pkg-config python rpcgen xz yajl + PATH: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin:$PATH + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + PKGS: augeas autoconf automake bash bash-completion ccache cpanminus cppi curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libiscsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make meson ncurses ninja perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yajl + MAKE: /usr/local/bin/gmake + PYTHON: /usr/local/bin/python3 macos_1015_task: install_script: @@ -20,6 +22,6 @@ macos_1015_task: - mkdir build - cd build - ../autogen.sh --prefix=$(pwd)/install-root - - gmake -j3 - - gmake -j3 install - - gmake -j3 dist + - $MAKE -j3 + - $MAKE -j3 install + - $MAKE -j3 dist -- 2.25.4