Browse Source

For CI - add debug builds for Android-CI.

Yao Wei Tjong 姚伟忠 8 năm trước cách đây
mục cha
commit
e0df869ec3
2 tập tin đã thay đổi với 30 bổ sung11 xóa
  1. 30 10
      .travis.yml
  2. 0 1
      Rakefile

+ 30 - 10
.travis.yml

@@ -306,7 +306,7 @@ cache:
     - $HOME/cmake-3.8.2-Linux-x86_64/share
 dist: trusty
 sudo: false
-addons: {apt: {packages: &default_packages [doxygen, graphviz, g++-multilib]}}
+addons: {apt: {packages: [doxygen, graphviz, g++-multilib]}}
 env:
   global:
     - secure: SLJCjkjDsTMbCIV9Wecz5JATnhk0fuzlnLMeZdvvFDv+8NL8cXyutkU0VfyRSLf3HSD1Js79a6fRMROyVGWj/w/BRrjqGnZzsB6+ZeJNnadiVIF5Gh+w90We5ccvSp2G4DyYgwkNnkKlJK7zNEWGu/K+bHL1EOCA+EIVrFMyA44=
@@ -319,16 +319,16 @@ env:
     - CCACHE_COMPRESS=1
     - CCACHE_MAXSIZE=100M
   matrix:
-    - ANDROID_ABI=armeabi-v7a ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang URHO3D_LIB_TYPE=STATIC                 # Using default native API Level android-9
-    - ANDROID_ABI=armeabi-v7a ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang URHO3D_LIB_TYPE=SHARED AVD=21
+    - &armeabi-v7a-static ANDROID_ABI=armeabi-v7a ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang URHO3D_LIB_TYPE=STATIC             # Using default native API Level android-9
+    - &armeabi-v7a-shared ANDROID_ABI=armeabi-v7a ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang URHO3D_LIB_TYPE=SHARED AVD=21
     # x86 and x86_64 emulation currently requires hardware acceleration which Travis-CI cannot provide, so skip testing using AVD for now
-    - ANDROID_ABI=x86_64 ANDROID_TOOLCHAIN_NAME=x86_64-clang URHO3D_LIB_TYPE=STATIC INSTALL=sys-img-x86_64-android-21   # Using default native API level android-21
-    - ANDROID_ABI=x86_64 ANDROID_TOOLCHAIN_NAME=x86_64-clang URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86_64-android-21
-    - ANDROID_ABI=x86    ANDROID_TOOLCHAIN_NAME=x86-clang URHO3D_LIB_TYPE=STATIC INSTALL=sys-img-x86-android-21 ANDROID_NATIVE_API_LEVEL=android-21   # At least android-12 is needed when LuaJIT is enabled
-    - ANDROID_ABI=x86    ANDROID_TOOLCHAIN_NAME=x86-clang URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86-android-21 ANDROID_NATIVE_API_LEVEL=android-21
+    - &x86_64-static ANDROID_ABI=x86_64 ANDROID_TOOLCHAIN_NAME=x86_64-clang URHO3D_LIB_TYPE=STATIC INSTALL=sys-img-x86_64-android-21    # Using default native API level android-21
+    - &x86_64-shared ANDROID_ABI=x86_64 ANDROID_TOOLCHAIN_NAME=x86_64-clang URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86_64-android-21
+    - &x86-static ANDROID_ABI=x86    ANDROID_TOOLCHAIN_NAME=x86-clang URHO3D_LIB_TYPE=STATIC INSTALL=sys-img-x86-android-21 ANDROID_NATIVE_API_LEVEL=android-21   # At least android-12 is needed when LuaJIT is on
+    - &x86-shared ANDROID_ABI=x86    ANDROID_TOOLCHAIN_NAME=x86-clang URHO3D_LIB_TYPE=SHARED INSTALL=sys-img-x86-android-21 ANDROID_NATIVE_API_LEVEL=android-21
     # ANDROID_ANDROID_ABI=arm64-v8a uses NEON by default, so the following two CI jobs also test NEON code path in the build
-    - ANDROID_ABI=arm64-v8a ANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang URHO3D_LIB_TYPE=STATIC NO_SDK_SYSIMG=1   # Using default native API level android-21
-    - ANDROID_ABI=arm64-v8a ANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang URHO3D_LIB_TYPE=SHARED NO_SDK_SYSIMG=1
+    - &arm64-v8a-static ANDROID_ABI=arm64-v8a ANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang URHO3D_LIB_TYPE=STATIC NO_SDK_SYSIMG=1 # Using default native API level android-21
+    - &arm64-v8a-shared ANDROID_ABI=arm64-v8a ANDROID_TOOLCHAIN_NAME=aarch64-linux-android-clang URHO3D_LIB_TYPE=SHARED NO_SDK_SYSIMG=1
 stage: build
 before_script:
   # Temporarily disable the test to build the APK as Travis-CI Trusty beta VM has not yet setup the environment for Android properly
@@ -349,7 +349,27 @@ script: rake ci && if [[ $PACKAGE_UPLOAD ]]; then rake ci_package_upload; fi &&
 after_script: rake ci_teardown_cache
 matrix:
   fast_finish: true
-  include: [stage: housekeep]
+  include:
+    - &debug-build-stage
+      stage: debug build
+      addons: {apt: {packages: g++-multilib}}
+      env: [*armeabi-v7a-static, CMAKE_BUILD_TYPE=Debug]
+      script: rake ci && rake ci_timer
+    - <<: *debug-build-stage
+      env: [*armeabi-v7a-shared, CMAKE_BUILD_TYPE=Debug]
+    - <<: *debug-build-stage
+      env: [*x86_64-static, CMAKE_BUILD_TYPE=Debug]
+    - <<: *debug-build-stage
+      env: [*x86_64-shared, CMAKE_BUILD_TYPE=Debug]
+    - <<: *debug-build-stage
+      env: [*x86-static, CMAKE_BUILD_TYPE=Debug]
+    - <<: *debug-build-stage
+      env: [*x86-shared, CMAKE_BUILD_TYPE=Debug]
+    - <<: *debug-build-stage
+      env: [*arm64-v8a-static, CMAKE_BUILD_TYPE=Debug]
+    - <<: *debug-build-stage
+      env: [*arm64-v8a-shared, CMAKE_BUILD_TYPE=Debug]
+    - stage: housekeep
 
 ---
 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 1
Rakefile


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác