[TravisCI] rearrange the config, test xcode9.3

.travis.yml

@@ -1,11 +1,11 @@
 language: haxe
 
-linux32_install: &linux32_install
-  - docker build -f Dockerfile-i386 -t hashlink .
-
 linux64_install: &linux64_install
   - docker build -f Dockerfile -t hashlink .
 
+linux32_install: &linux32_install
+  - docker build -f Dockerfile-i386 -t hashlink .
+
 docker_cmake_script: &docker_cmake_script
   - >
     docker run hashlink bash -c
@@ -18,7 +18,6 @@ docker_cmake_script: &docker_cmake_script
     make &&
     make test ARGS=-V'
 
-
 docker_make_script: &docker_make_script
   - >
     docker run hashlink bash -c
@@ -37,73 +36,71 @@ mac_before_install: &mac_before_install
   - brew install jpeg-turbo sdl2 libogg libvorbis openal-soft mbedtls libuv
   - haxelib install hashlink
 
+cmake_install: &cmake_install
+  - cmake .
+  - make
+
 make_install: &make_install
   - make all
   - sudo make install
 
-cmake_install: &cmake_install
-  - cmake .
-  - make
+cmake_script: &cmake_script
+  - make test ARGS="-V"
 
 make_script: &make_script
   - haxe -hl src/_main.c -cp other/tests -main HelloWorld &&
     make hlc &&
     ./hlc
-cmake_script: &cmake_script
-  - make test ARGS="-V"
 
 sudo: required
 matrix:
   include:
+    # Linux 64-bit
     - haxe: development
       os: linux
       dist: trusty
-      env: ARCH=32 BUILD=cmake
+      env: ARCH=64 BUILD=cmake
       services: [docker]
-      install: *linux32_install
+      install: *linux64_install
       script: *docker_cmake_script
     - haxe: development
       os: linux
       dist: trusty
-      env: ARCH=32 BUILD=make
+      env: ARCH=64 BUILD=make
       services: [docker]
-      install: *linux32_install
+      install: *linux64_install
       script: *docker_make_script
+    # Linux 32-bit
     - haxe: development
       os: linux
       dist: trusty
-      env: ARCH=64 BUILD=cmake
+      env: ARCH=32 BUILD=cmake
       services: [docker]
-      install: *linux64_install
+      install: *linux32_install
       script: *docker_cmake_script
     - haxe: development
       os: linux
       dist: trusty
-      env: ARCH=64 BUILD=make
+      env: ARCH=32 BUILD=make
       services: [docker]
-      install: *linux64_install
+      install: *linux32_install
       script: *docker_make_script
+    # Mac xcode9.3
     - haxe: development
       os: osx
-      osx_image: xcode8
-      env: ARCH=64 BUILD=make
-      before_install: *mac_before_install
-      install: *make_install
-      script: *make_script
-    - haxe: development
-      os: osx
-      osx_image: xcode8
+      osx_image: xcode9.3
       env: ARCH=64 BUILD=cmake
       before_install: *mac_before_install
       install: *cmake_install
       script: *cmake_script
     - haxe: development
       os: osx
-      osx_image: xcode7.1
+      osx_image: xcode9.3
       env: ARCH=64 BUILD=make
       before_install: *mac_before_install
       install: *make_install
       script: *make_script
+    # Mac xcode7.1
     - haxe: development
       os: osx
       osx_image: xcode7.1
@@ -111,3 +108,10 @@ matrix:
       before_install: *mac_before_install
       install: *cmake_install
       script: *cmake_script
+    - haxe: development
+      os: osx
+      osx_image: xcode7.1
+      env: ARCH=64 BUILD=make
+      before_install: *mac_before_install
+      install: *make_install
+      script: *make_script