From f9f96552b7e0c2e5884c8f0b77361f17a932d984 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Sat, 30 Mar 2019 01:28:22 +0300
Subject: [PATCH] travis: move mingw engine build to standalone VM

---
 .travis.yml                    | 31 ++++++++++++++++++++++---------
 scripts/travis_linux_deps.sh   |  4 ----
 scripts/travis_mingw_deps.sh   |  3 +++
 scripts/travis_windows_deps.sh |  3 ---
 4 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 scripts/travis_mingw_deps.sh

diff --git a/.travis.yml b/.travis.yml
index 3eee48c6..2f668c43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,17 +24,13 @@ jobs:
       script:
         - sh scripts/yadisk_clear.sh
     - stage: build
-      name: "Build for Linux, MinGW & Android"
+      name: "Build for Linux & Android"
       cache: ccache
       os: linux
       dist: xenial
       addons:
         apt:
           packages:
-            - mingw-w64-i686-dev
-            - binutils-mingw-w64-i686
-            - gcc-mingw-w64-i686
-            - g++-mingw-w64-i686
             - p7zip-full
             - gcc-multilib
             - g++-multilib
@@ -53,11 +49,30 @@ jobs:
         - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:$PWD/android-ndk
       script:
         - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
+      after_script:
+        - ccache --show-stats
+        - sh scripts/yadisk_upload.sh Xash3DFWGS-i386.AppImage
+    - # ...
+      name: "Build for Windows MinGW"
+      cache: ccache
+      os: linux
+      dist: xenial
+      addons:
+        apt:
+          packages:
+            - mingw-w64-i686-dev
+            - binutils-mingw-w64-i686
+            - gcc-mingw-w64-i686
+            - g++-mingw-w64-i686
+            - p7zip-full
+      before_script:
+        - sh scripts/travis_common_deps.sh
+        - sh scripts/travis_mingw_deps.sh
+      script:
         - sh scripts/build_mingw_engine.sh
       after_script:
-        - cd ${TRAVIS_BUILD_DIR}
         - ccache --show-stats
-        - sh scripts/yadisk_upload.sh Xash3DFWGS-i386.AppImage xash3d-mingw.7z
+        - sh scripts/yadisk_upload.sh xash3d-mingw.7z
     - # ...
       name: "Build for OSX"
       cache: ccache
@@ -68,7 +83,6 @@ jobs:
       script:
         - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
       after_script:
-        - cd ${TRAVIS_BUILD_DIR}
         - sh scripts/yadisk_upload.sh xash3d-osx.tar.bz2
     - # ...
       name: "Build for Windows MSVC"
@@ -80,7 +94,6 @@ jobs:
       script:
         - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
       after_script:
-        - cd ${TRAVIS_BUILD_DIR}
         - sh scripts/yadisk_upload.sh xash3d-vc.7z
     - stage: deploy
       name: "Deploy to github"
diff --git a/scripts/travis_linux_deps.sh b/scripts/travis_linux_deps.sh
index 7b7aed4f..886597ba 100755
--- a/scripts/travis_linux_deps.sh
+++ b/scripts/travis_linux_deps.sh
@@ -2,10 +2,6 @@
 curl -s http://libsdl.org/release/SDL2-$SDL_VERSION.tar.gz | tar xzf -
 mv SDL2-$SDL_VERSION SDL2_src
 
-# SDL2 for MinGW prebuilt
-curl -s http://libsdl.org/release/SDL2-devel-$SDL_VERSION-mingw.tar.gz | tar xzf -
-mv SDL2-$SDL_VERSION SDL2_mingw
-
 # Android build deps
 # curl -s http://dl.google.com/android/android-sdk_r22.0.4-linux.tgz | tar xzf -
 # export ANDROID_HOME=$PWD/android-sdk-linux
diff --git a/scripts/travis_mingw_deps.sh b/scripts/travis_mingw_deps.sh
new file mode 100644
index 00000000..d78b5507
--- /dev/null
+++ b/scripts/travis_mingw_deps.sh
@@ -0,0 +1,3 @@
+# SDL2 for MinGW prebuilt
+curl -s http://libsdl.org/release/SDL2-devel-$SDL_VERSION-mingw.tar.gz | tar xzf -
+mv SDL2-$SDL_VERSION SDL2_mingw
diff --git a/scripts/travis_windows_deps.sh b/scripts/travis_windows_deps.sh
index 5603b45c..bd113407 100644
--- a/scripts/travis_windows_deps.sh
+++ b/scripts/travis_windows_deps.sh
@@ -1,6 +1,3 @@
-# python 3.6
-choco install python3 -y
-
 # SDL2 for VC prebuilt
 curl http://libsdl.org/release/SDL2-devel-$SDL_VERSION-VC.zip -o SDL2.zip
 unzip SDL2.zip