From 8e9f773f04f19dc856c326309aaa99de734f4a6f Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 28 Nov 2018 10:49:05 +0100 Subject: [PATCH] travis: re-enable mingw build with newer eolian_gen for bootstrap The docker image now contains a native efl build as bootstrap for doing the mingw cross-build. Paths to the generator binaries have been update. We also switched to using a dedicated Fedora28-mingw docker image for now to have a more stable environment for now. Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D7377 --- .ci/ci-configure.sh | 5 +++-- .travis.yml | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index bd434d33c7..3e398bd057 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -73,8 +73,9 @@ else RELEASE_READY_LINUX_COPTS=" --with-profile=release" - MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \ - --with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \ + MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/bin/eolian_gen \ + --with-edje-cc=/usr/local/bin/edje_cc --with-eet-eet=/usr/local/bin/eet \ + --with-bin-elm-prefs-cc=/usr/local/bin/elm_prefs_cc \ --disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \ --disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \ --disable-librsvg --disable-pulseaudio --disable-cxx-bindings \ diff --git a/.travis.yml b/.travis.yml index 35f6e15cba..7974cf5f38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,10 @@ env: jobs: include: + - env: + - os: linux + - DISTRO=Fedora28-mingw + - CI_BUILD_TYPE=mingw - env: - os: linux - DISTRO=Fedora28 @@ -70,11 +74,6 @@ jobs: exclude: - os: linux -# - env: -# - os: linux -# - DISTRO=Fedora28 -# - CI_BUILD_TYPE=mingw - services: - docker