summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2018-11-28 10:49:05 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-12-07 12:39:35 +0100
commit8e9f773f04f19dc856c326309aaa99de734f4a6f (patch)
tree12179f336e69b1b6d765d497d8307dc99924dc66
parent436c5b85232a2e5326db96d4cacedfe3b73c664f (diff)
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
-rwxr-xr-x.ci/ci-configure.sh5
-rw-r--r--.travis.yml9
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
73 73
74 RELEASE_READY_LINUX_COPTS=" --with-profile=release" 74 RELEASE_READY_LINUX_COPTS=" --with-profile=release"
75 75
76 MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \ 76 MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/bin/eolian_gen \
77 --with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \ 77 --with-edje-cc=/usr/local/bin/edje_cc --with-eet-eet=/usr/local/bin/eet \
78 --with-bin-elm-prefs-cc=/usr/local/bin/elm_prefs_cc \
78 --disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \ 79 --disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \
79 --disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \ 80 --disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
80 --disable-librsvg --disable-pulseaudio --disable-cxx-bindings \ 81 --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
@@ -22,6 +22,10 @@ jobs:
22 include: 22 include:
23 - env: 23 - env:
24 - os: linux 24 - os: linux
25 - DISTRO=Fedora28-mingw
26 - CI_BUILD_TYPE=mingw
27 - env:
28 - os: linux
25 - DISTRO=Fedora28 29 - DISTRO=Fedora28
26 - CI_BUILD_TYPE=options-enabled 30 - CI_BUILD_TYPE=options-enabled
27 - env: 31 - env:
@@ -70,11 +74,6 @@ jobs:
70 exclude: 74 exclude:
71 - os: linux 75 - os: linux
72 76
73# - env:
74# - os: linux
75# - DISTRO=Fedora28
76# - CI_BUILD_TYPE=mingw
77
78services: 77services:
79 - docker 78 - docker
80 79