summaryrefslogtreecommitdiff
path: root/.travis.yml
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 /.travis.yml
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
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
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