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 <marcel-hollerbach@t-online.de>
Differential Revision: https://phab.enlightenment.org/D7377

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index bd434d3..3e398bd 100755 (executable)
--- 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 35f6e15..7974cf5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,10 @@ jobs:
   include:
     - env:
       - os: linux
+      - DISTRO=Fedora28-mingw
+      - CI_BUILD_TYPE=mingw
+    - env:
+      - os: linux
       - DISTRO=Fedora28
       - CI_BUILD_TYPE=options-enabled
     - env:
@@ -70,11 +74,6 @@ jobs:
   exclude:
     - os: linux
 
-#    - env:
-#      - os: linux
-#      - DISTRO=Fedora28
-#      - CI_BUILD_TYPE=mingw
-
 services:
   - docker