11:21 a.m.
Andrea Bolognani (2):
ci: Make container environment available to scripts
travis: Use dedicated images for MinGW builds
.travis.yml | 10 ++++------
ci/Makefile | 2 ++
2 files changed, 6 insertions(+), 6 deletions(-)
--
2.24.1
11:21 a.m.
New subject: [libvirt PATCH 1/2] ci: Make container environment available to scripts
For container images targeted at cross-building, we bake a small
amount of architecture-specific information in the environment so
that builds can work as expected without requiring additional work
from the user; unfortunately this information got lost as soon as
we called sudo. Explicitly allow it.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
ci/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ci/Makefile b/ci/Makefile
index acb655941c..03799924b4 100644
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -220,6 +220,8 @@ ci-run-command@%: ci-prepare-tree
--login \
--user="#$(CI_UID)" \
--group="#$(CI_GID)" \
+ CONFIGURE_OPTS="$$CONFIGURE_OPTS" \
+ PKG_CONFIG_LIBDIR="$$PKG_CONFIG_LIBDIR" \
CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
CI_CONT_BUILDDIR="$(CI_CONT_BUILDDIR)" \
CI_SMP="$(CI_SMP)" \
--
2.24.1
11:21 a.m.
New subject: [libvirt PATCH 2/2] travis: Use dedicated images for MinGW builds
Now that we treat MinGW like any other cross-build target, we
should update our Travis CI configuration.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
This patch needs
https://www.redhat.com/archives/libvir-list/2020-February/msg00409.html
to be merged into libvirt-jenkins-ci and the corresponding
container images to be regenerated.
.travis.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b243e3d5c4..f400f76118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,17 +56,15 @@ matrix:
- services:
- docker
env:
- - IMAGE="fedora-30"
- - MINGW="mingw32"
+ - IMAGE="fedora-30-cross-mingw32"
script:
- - make -C ci/ ci-build@$IMAGE CI_CONFIGURE="$MINGW-configure"
+ - make -C ci/ ci-build@$IMAGE
- services:
- docker
env:
- - IMAGE="fedora-30"
- - MINGW="mingw64"
+ - IMAGE="fedora-30-cross-mingw64"
script:
- - make -C ci/ ci-build@$IMAGE CI_CONFIGURE="$MINGW-configure"
+ - make -C ci/ ci-build@$IMAGE
- compiler: clang
language: c
os: osx
--
2.24.1
6:44 a.m.
On Mon, 2020-02-10 at 18:21 +0100, Andrea Bolognani wrote:
Andrea Bolognani (2):
ci: Make container environment available to scripts
travis: Use dedicated images for MinGW builds
.travis.yml | 10 ++++------
ci/Makefile | 2 ++
2 files changed, 6 insertions(+), 6 deletions(-)
Pushed now as a CI fix, since the newly-build Fedora 30 image doesn't
contain MinGW packages.
--
Andrea Bolognani / Red Hat / Virtualization
1733
days inactive
1747
days old
3 comments
1 participants
participants (1)
-
Andrea Bolognani